海南版本提交

pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java

@@ -552,12 +552,30 @@ public enum DicDataEnum {
     Imp_Users("重要敏感用户","Imp_Users"),
     Station_Other("其他","Other"),
 
+    /*承载能力评估用户类型*/
+    Power_Station_Users("光伏电站用户","Power_Station_Users"),
+    Charging_Station_Users("充电站用户","Charging_Station_Users"),
+    Electric_Heating_Load_Users("电加热负荷用户","Electric_Heating_Load_Users"),
+    Electrified_Rail_Users("电气化铁路用户","Electrified_Rail_Users"),
+
+    //变压器连接方式
+    YNd11("YNd11","YNd11"),
+    YNy0("YNy0","YNy0"),
+    Yy0("Yy0","Yy0"),
+    Yyn0("Yyn0","Yyn0"),
+    Yd11("Yd11","Yd11"),
+    Y_yn("Y/yn","Y_yn"),
+    Y_d("Y/d","Y_d"),
+    D_y("D/y","D_y"),
+    YNyn("YNyn","YNyn"),
+
+    //用户模式
+    SPECIAL_USER("专变用户","special_user"),//专变用户
+    PUBLIC_USER("公变用户","public_user"),// ,公变用户
 
 
 
-
-
-    /**pms******************************end*/
+            /**pms******************************end*/
     ;
 
     private final String name;

pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java

@@ -120,10 +120,12 @@ public enum DicDataTypeEnum {
     INDUSTRY_TYPE("行业分类","industry_type"),
     PLAN_STATUS("计划状态","plan_status"),
     APP_EVENT("APP暂态事件类型","app_event"),
-    DEVICE_TYPE("治理装置类型编码","Device_Type")
-
+    DEVICE_TYPE("治理装置类型编码","Device_Type"),
 
+    CARRY_CAPCITY_USER_TYPE("承载能力评估用户类型","carry_capcity_user_type"),
+    CARRY_CAPCITY_CONNECTION_MODE("变压器连接方式","carry_capcity_connection_mode"),
 
+    CARRY_CAPCITYUSER_MODE("用户模式","carry_capcity_user_mode"),
             ;