代码提交

pom.xml

@@ -42,20 +42,14 @@
         <!--中间件目标地址-->
         <middle.server.url>192.168.1.13</middle.server.url>
         <!--微服务模块发布地址-->
-        <service.server.url>192.168.1.111</service.server.url>
+        <service.server.url>192.168.1.139</service.server.url>
         <!--docker仓库地址-->
-        <docker.server.url>192.168.1.31</docker.server.url>
+        <docker.server.url>192.168.1.13</docker.server.url>
         <!--nacos的ip:port-->
         <nacos.url>${middle.server.url}:18848</nacos.url>
         <!--服务器发布内容为空-->
-        <nacos.namespace></nacos.namespace>
+        <!--<nacos.namespace></nacos.namespace>-->
-<!--        <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>-->
+        <nacos.namespace>415a1c87-33aa-47bd-8e25-13cc456c87ed</nacos.namespace>
-<!--        13-->
-<!--        <nacos.namespace>2974723d-4032-4d63-a0fa-80921894b9c3</nacos.namespace>-->
-
-
-
-
         <!--sentinel:port-->
         <sentinel.url>${middle.server.url}:8080</sentinel.url>
         <!--网关地址，主要用于配置swagger中认证token-->

pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java

@@ -19,9 +19,9 @@ import java.util.stream.Stream;
  */
 public class GenerateCode {
 
-    private static final String TARGET_DIR = "D://code";
+    private static final String TARGET_DIR = "C://code";
 
-    private static final String DB_URL = "jdbc:mysql://192.168.1.18:13306/pqsinfo_pms";
+    private static final String DB_URL = "jdbc:mysql://192.168.1.18:13306/pqsinfo_test";
 
     private static final String USERNAME = "root";
 
@@ -30,24 +30,9 @@ public class GenerateCode {
 
     public static void main(String[] args) {
         List<Module> modules = Stream.of(
-                new Module("hongawen", "com.njcn.device", "pms", Stream.of(
+                new Module("xuyang", "com.njcn.access", "zl", Stream.of(
-                        "pms_monitor"
+                        "ele_epd_pqd"
-                        ,"pms_distribution_monitor"
+                        ).collect(Collectors.toList()), "")
-                        ,"pms_harmonic_general_management"
-                        ,"pms_harmonic_general_management_data"
-                        ,"pms_power_client"
-                        ,"pms_power_distributionarea"
-                        ,"pms_power_generation_user"
-                        ,"pms_power_quality_matter"
-                        ,"pms_source_management"
-                        ,"pms_statation_stat"
-                        ,"pms_statistics_run_monitor"
-                        ,"pms_terminal"
-                        ,"pms_terminal_eliminate_data"
-                        ,"pms_traction_station"
-                        ,"pms_transient_stastic_data"
-                        ,"pms_treat_transient_detail_data"
-                        ).collect(Collectors.toList()), "pms_")
         ).collect(Collectors.toList());
         generateJavaFile(modules);
     }

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

@@ -327,6 +327,22 @@ public enum DicDataEnum {
     GATEWAY_DEV("网关", "Gateway_Dev"),
     CONNECT_DEV("直连设备", "Connect_Dev"),
 
+    /**
+     * 治理数据模型
+     */
+    EPD("电能数据","Epd"),
+    PQD("电能质量数据","Pqd"),
+    BMD("基础测量数据","Bmd"),
+    EVT("事件","Evt"),
+    ALM("告警","Alm"),
+    STS("状态","Sts"),
+    DI("开入","Di"),
+    DO("电能数据","Do"),
+    PARM("参数","Parm"),
+    SET("定值","Set"),
+    INSET("内部定值","InSet"),
+    CTRL("控制","Ctrl"),
+
     /**
      * 暂降类型
      */

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

@@ -74,6 +74,7 @@ public enum DicDataTypeEnum {
     ALARM_LEVEL("警告级别","Alarm_Level"),
 
 
+    CS_DATA_TYPE("治理数据模型", "Cs_Data_Type"),
     ;