From 1036db9a03649a9c811632da5cffcdd970a88dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Mon, 12 Jun 2023 14:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/event/pojo/po/RStatSubstationM.java  |  4 +-
 .../njcn/event/pojo/po/RStatSubstationQ.java  |  4 +-
 .../njcn/event/pojo/po/RStatSubstationY.java  |  4 +-
 .../harmonic/pojo/po/RStatSubstationM.java    |  2 +-
 .../harmonic/pojo/po/RStatSubstationQ.java    |  2 +-
 .../harmonic/pojo/po/RStatSubstationY.java    |  2 +-
 .../com/njcn/system/enums/DicDataEnum.java    | 43 ++++++++++++++++++-
 .../njcn/system/enums/DicDataTypeEnum.java    |  8 ++++
 8 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationM.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationM.java
index a1fd19401..2ab005f00 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationM.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationM.java
@@ -13,7 +13,7 @@ import java.time.LocalDate;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu
@@ -35,7 +35,7 @@ public class RStatSubstationM implements Serializable {
     private String substationId;
 
     @ApiModelProperty(value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Float effectiveMeasurementAverage;
 
     @ApiModelProperty(value = "累计有效接入监测点数")
     private Integer effectiveMeasurementAccrued;
diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationQ.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationQ.java
index b32b8f4e7..12cc172d9 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationQ.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationQ.java
@@ -13,7 +13,7 @@ import java.time.LocalDate;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu
@@ -35,7 +35,7 @@ public class RStatSubstationQ implements Serializable {
     private String substationId;
 
     @ApiModelProperty(value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Float effectiveMeasurementAverage;
 
     @ApiModelProperty(value = "累计有效接入监测点数")
     private Integer effectiveMeasurementAccrued;
diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationY.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationY.java
index 9d6ae9cfd..d7b621468 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationY.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationY.java
@@ -13,7 +13,7 @@ import java.time.LocalDate;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu
@@ -35,7 +35,7 @@ public class RStatSubstationY implements Serializable {
     private String substationId;
 
     @ApiModelProperty(value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Float effectiveMeasurementAverage;
 
     @ApiModelProperty(value = "累计有效接入监测点数")
     private Integer effectiveMeasurementAccrued;
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java
index f3c89aede..b87a70f8e 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java
@@ -35,7 +35,7 @@ public class RStatSubstationM implements Serializable {
     private String substationId;
 
     @ApiModelProperty(value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Float effectiveMeasurementAverage;
 
     @ApiModelProperty(value = "累计有效接入监测点数")
     private Integer effectiveMeasurementAccrued;
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java
index 8213b4d56..a9db71ef9 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java
@@ -35,7 +35,7 @@ public class RStatSubstationQ implements Serializable {
     private String substationId;
 
     @ApiModelProperty(value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Float effectiveMeasurementAverage;
 
     @ApiModelProperty(value = "累计有效接入监测点数")
     private Integer effectiveMeasurementAccrued;
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java
index f002c4289..4a5e23d07 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java
@@ -35,7 +35,7 @@ public class RStatSubstationY implements Serializable {
     private String substationId;
 
     @ApiModelProperty(value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Float effectiveMeasurementAverage;
 
     @ApiModelProperty(value = "累计有效接入监测点数")
     private Integer effectiveMeasurementAccrued;
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 a075e75e0..822e82c77 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
@@ -46,13 +46,43 @@ public enum DicDataEnum {
 
 
     /**
-     * 监测点类型
+     * 监测点类别
      */
     ONE_LINE("I类监测点", "One_Line"),
     TWO_LINE("II类监测点", "Two_Line"),
     THREE_LINE("III类监测点", "Three_Line"),
 
 
+    /**
+     * 监测点类型
+     */
+    Power_Supply_Point("供电点","Power_Supply_Point"),
+    Pub_Connect_Point("公共连接点PCC","Pub_Connect_Point"),
+    Parallel_Point("并网点","Parallel_Point"),
+    Other("其他","Other"),
+
+
+    /**
+     * 电压互感器类型
+     */
+    Cap_V("电容式电压互感器","Cap_V"),
+    Pele_V("光电式电压互感器","Pele_V"),
+    A_V("A类测试电压互感器","A_V"),
+    Elec_V("电子式电压互感器","Elec_V"),
+    Other_S("其他","Other"),
+    Ele_V("电磁式电压互感器","Ele_V"),
+
+    /**
+     * 中性点接地方式
+     */
+    Ground_Res("经非线性电阻接地-消谐器","Ground_Res"),
+    Ground_Trans("经互感器接地-4PT","Ground_Trans"),
+    Ground_Dir("直接接地-3PT","Ground_Dir"),
+    A_Center("A类测试中性点接地方式","A_Center"),
+    Ground_Other("其他","Other"),
+
+
+
 
     /**
      * 终端类型
@@ -377,6 +407,17 @@ public enum DicDataEnum {
 
     ALARM("告警", "Alarm"),
     FAULT("故障", "Fault"),
+
+    /**
+     * 装置级别
+     */
+    MOST_IMPORMENT("极重要","Vital"),
+
+    /**
+     * 测量信号输入形式
+     */
+    NUMBER_SIGNAL("数字信号","Digital_Signal"),
+    SIMULATION_SIGNAL("模拟信号","Analog_Signal")
     ;
 
     private final String name;
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 02bf9c8e8..6624de627 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
@@ -75,6 +75,14 @@ public enum DicDataTypeEnum {
 
 
     CS_DATA_TYPE("治理数据模型", "Cs_Data_Type"),
+
+
+    //pms
+    DEV_CATEGORY("装置类别","Device_Category"),
+    DEV_GRADE("装置级别","Dev_Level"),
+    INPUT_SIGNAL("测量信号输入形式","Signal_form"),
+    VOLTAGE_TRANSFORMER("电压互感器类型","Voltage_Transformer"),
+    Neutral_Point("中性点接地方式","Neutral_Point")
     ;