告警保护方案轮询-初稿

ems-system/src/main/java/com/xzzn/ems/domain/vo/ProtectionPlanVo.java

@@ -0,0 +1,74 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 告警保护方案-保护方案设置
+ */
+public class ProtectionPlanVo {
+    /** 设备 */
+    private String deviceId;
+
+    /** 点位 */
+    private String point;
+
+    /** 点位名称 */
+    private String pointName;
+
+    /** 设置值 */
+    private BigDecimal value;
+
+    /** 设备类型 */
+    private String deviceCategory;
+
+    /** 设备类型名称 */
+    private String categoryName;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getPoint() {
+        return point;
+    }
+
+    public void setPoint(String point) {
+        this.point = point;
+    }
+
+    public String getPointName() {
+        return pointName;
+    }
+
+    public void setPointName(String pointName) {
+        this.pointName = pointName;
+    }
+
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    public String getDeviceCategory() {
+        return deviceCategory;
+    }
+
+    public void setDeviceCategory(String deviceCategory) {
+        this.deviceCategory = deviceCategory;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/vo/ProtectionSettingVo.java

@@ -0,0 +1,118 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 告警保护方案-保护前提设置
+ */
+public class ProtectionSettingVo {
+    /** 设备 */
+    private String deviceId;
+
+    /** 点位 */
+    private String point;
+
+    /** 点位名称 */
+    private String pointName;
+
+    /** 故障值 */
+    private BigDecimal faultValue;
+
+    /** 故障值比较方式 如"<="、"<"、"=="、">="、">" */
+    private String faultOperator;
+
+    /** 释放值 */
+    private BigDecimal releaseValue;
+
+    /** 释放值比较方式 如"<="、"<"、"=="、">="、">"*/
+    private String releaseOperator;
+
+    /** 与下一点位关系: && 、|| */
+    private String relationNext;
+
+    /** 设备类型 */
+    private String deviceCategory;
+
+    /** 设备类型名称 */
+    private String categoryName;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getPoint() {
+        return point;
+    }
+
+    public void setPoint(String point) {
+        this.point = point;
+    }
+
+    public String getPointName() {
+        return pointName;
+    }
+
+    public void setPointName(String pointName) {
+        this.pointName = pointName;
+    }
+
+    public BigDecimal getFaultValue() {
+        return faultValue;
+    }
+
+    public void setFaultValue(BigDecimal faultValue) {
+        this.faultValue = faultValue;
+    }
+
+    public String getFaultOperator() {
+        return faultOperator;
+    }
+
+    public void setFaultOperator(String faultOperator) {
+        this.faultOperator = faultOperator;
+    }
+
+    public BigDecimal getReleaseValue() {
+        return releaseValue;
+    }
+
+    public void setReleaseValue(BigDecimal releaseValue) {
+        this.releaseValue = releaseValue;
+    }
+
+    public String getReleaseOperator() {
+        return releaseOperator;
+    }
+
+    public void setReleaseOperator(String releaseOperator) {
+        this.releaseOperator = releaseOperator;
+    }
+
+    public String getRelationNext() {
+        return relationNext;
+    }
+
+    public void setRelationNext(String relationNext) {
+        this.relationNext = relationNext;
+    }
+
+    public String getDeviceCategory() {
+        return deviceCategory;
+    }
+
+    public void setDeviceCategory(String deviceCategory) {
+        this.deviceCategory = deviceCategory;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+}

ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java

@@ -108,8 +108,10 @@ public class DDSDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
             return;
         }
 
-        // 存放mqtt原始每个设备数据，便于后面点位获取数据
+        // 存放mqtt原始每个设备最晚一次数据，便于后面点位获取数据
         redisCache.setCacheObject(RedisKeyConstants.ORIGINAL_MQTT_DATA + SITE_ID + "_" + deviceId, obj);
+        // 存放每次同步数据，失效时间（同同步时间）-用于判断是否正常同步数据
+        redisCache.setCacheObject(RedisKeyConstants.SYNC_DATA + SITE_ID + "_" + deviceId, obj, 2, TimeUnit.MINUTES);
 
         // 处理相关数据
         if (deviceId.contains("BMSD")) {

ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java

@@ -110,8 +110,10 @@ public class FXXDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
                 return;
             }
 
-            // 存放mqtt原始每个设备数据，便于后面点位获取数据
+            // 存放mqtt原始每个设备最晚一次数据，便于后面点位获取数据
             redisCache.setCacheObject(RedisKeyConstants.ORIGINAL_MQTT_DATA + SITE_ID + "_" + deviceId, obj);
+            // 存放每次同步数据，失效时间（同同步时间）-用于判断是否正常同步数据
+            redisCache.setCacheObject(RedisKeyConstants.SYNC_DATA + SITE_ID + "_" + deviceId, obj, 1, TimeUnit.MINUTES);
 
             if (deviceId.contains("BMSD")) {
                 batteryStackDataProcess(deviceId, jsonData);