From 0d05558e98ae59a4216076e9cf01ba6fd06cad96 Mon Sep 17 00:00:00 2001
From: hanyong <1334742946@qq.com>
Date: Tue, 13 Jun 2023 09:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/system/enums/DicDataEnum.java    | 20 +++++++++++++++++--
 .../njcn/system/enums/DicDataTypeEnum.java    |  6 ++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
index 822e82c77..db46fb5f7 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
@@ -417,8 +417,24 @@ public enum DicDataEnum {
      * 测量信号输入形式
      */
     NUMBER_SIGNAL("数字信号","Digital_Signal"),
-    SIMULATION_SIGNAL("模拟信号","Analog_Signal")
-    ;
+    SIMULATION_SIGNAL("模拟信号","Analog_Signal"),
+
+    /**
+     * 设备地区特征
+     */
+    DOWNTOWN("市中心区","downtown"),
+    CITY("市区","city"),
+    TOWN("城镇","town"),
+    COUNTY_SEAT("县城区","County_Seat"),
+    COUNTRYSIDE("农村","countryside"),
+    TOWNSHIP("乡镇","township"),
+    AGRO_AREA("农牧区","Agro_Area"),
+
+    /**
+     * 设备使用性质代码
+     */
+    DEDICATED("专用","dedicated"),
+    PUBLIC("公用","public");
 
     private final String name;
     private final String code;
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
index 6624de627..d43e359a3 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
@@ -82,8 +82,10 @@ public enum DicDataTypeEnum {
     DEV_GRADE("装置级别","Dev_Level"),
     INPUT_SIGNAL("测量信号输入形式","Signal_form"),
     VOLTAGE_TRANSFORMER("电压互感器类型","Voltage_Transformer"),
-    Neutral_Point("中性点接地方式","Neutral_Point")
-    ;
+    Neutral_Point("中性点接地方式","Neutral_Point"),
+    DEVICE_REGIONLYPE("设备地区特征","Device_RegionLype"),
+    DEVICE_USERNATURE("设备使用性质代码","Device_UseNature");
+