1.数据单位管理

2.谐波模块-excel和word报告数据单位调整
3.监测点权重管理

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

@@ -476,6 +476,17 @@ public enum DicDataEnum {
     AUTHORITY_TRANSFER("权限转移","Authority_transfer"),
     DATA_RECOVERY("数据恢复","Data_recovery"),
 
+    /**
+     * 谐波数据报表，数据单位类别
+     */
+    EFFECTIVE("有效值","effective"),
+    POWER("功率","power"),
+    DISTORTION("畸变率","distortion"),
+    VOLTAGE("电压偏差","voltage"),
+    UNIT_FREQUENCY("频率","unitFrequency"),
+    UNBALANCE("三项不平横","unbalance"),
+    FUND("基波","fund"),
+
             ;
 
 

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

@@ -95,7 +95,9 @@ public enum DicDataTypeEnum {
 
     APP_BASE_INFORMATION_TYPE("app基础信息类型","appInformationType"),
 
-    APP_DEVICE_EVENT_TYPE("app设备事件类型","appDeviceEventType")
+    APP_DEVICE_EVENT_TYPE("app设备事件类型","appDeviceEventType"),
+
+    DEVICE_UNIT("数据单位类型","Device_Unit")