录入中环sacada设备

custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DeviceField.java

@@ -18,8 +18,31 @@ public enum DeviceField {
     FLOW_TOTAL_POS("flow_total_pos", "正向累计流量读数"),
     //反向累积流量读数
     FLOW_TOTAL_REV("flow_total_rev", "反向累计流量读数"),
+    //净累积流量读数
+    FLOW_TOTAL_NET("flow_total_net", "净累积流量读数"),
+
     //瞬时压力
-    PRESS_CUR("press_cur", "瞬时压力");
+    PRESS_CUR("press_cur", "瞬时压力"),
+    //电池电压
+    BATTERY_VOLTAGE("battery_voltage", "电池电压"),
+
+    //ph
+    PH("ph", "PH值"),
+    //余氯
+    CHLORINE("chlorine", "余氯"),
+    //浊度
+    TURBIDITY("turbidity", "浊度"),
+    //水温
+    TEMPERATURE("temperature", "水温"),
+
+    //液位
+    LEVEL("level", "液位"),
+
+    //运行状态
+    RUNNING("running", "运行状态"),
+    //频率
+    FREQUENCY("frequency", "频率(水泵)"),
+    ;
     /**
      * 标识
      */

custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DeviceKind.java

@@ -3,11 +3,6 @@ package com.shkpr.service.customgateway.core.constants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import java.util.Arrays;
-import java.util.List;
-
-import static com.shkpr.service.customgateway.core.constants.DeviceField.*;
-
 /**
  * 设备种类
  *
@@ -18,9 +13,17 @@ import static com.shkpr.service.customgateway.core.constants.DeviceField.*;
 @AllArgsConstructor
 public enum DeviceKind {
     //压力流量计
-    FLOW_PRESS("flow", "流量计", 1, "WaterMeter", Arrays.asList(FLOW_CUR, FLOW_TOTAL_POS, FLOW_TOTAL_REV, PRESS_CUR)),
+    FLOW_PRESS("flow_press", "流量计", 1, "WaterMeter"),
     //流量计
-    FLOW("flow", "流量计", 2, "WaterMeter", Arrays.asList(FLOW_CUR, FLOW_TOTAL_POS, FLOW_TOTAL_REV)),
+    FLOW("flow", "流量计", 2, "WaterMeter"),
+    //压力计
+    PRESS("press", "压力计", 3, "WaterMeter"),
+    //水质仪
+    QUALITY("quality", "多参数水质仪", 10, "WaterQuality"),
+    //液位计
+    LEVEL("level", "液位计", 11, "LiquidLevel"),
+    //水泵
+    WATER_PUMP("water_pump","水泵", 20, "WaterPump"),
     ;
     /**
      * 标识
@@ -38,8 +41,4 @@ public enum DeviceKind {
      * 表名
      */
     private final String measurement;
-    /**
-     * 包含字段
-     */
-    private final List<DeviceField> fields;
 }