单站监控-设备状态同设备列表

ems-common/src/main/java/com/xzzn/common/enums/CommunicationStatus.java

@@ -7,7 +7,7 @@ package com.xzzn.common.enums;
  */
 public enum CommunicationStatus
 {
-    OK("0", "正常"), SUSPEND("1", "通信中断") ,EXCEPTION("1", "异常");
+    OK("0", "正常"), SUSPEND("1", "通信中断") ,EXCEPTION("2", "异常");
 
     private final String code;
     private final String info;

ems-common/src/main/java/com/xzzn/common/enums/DeviceRunningStatus.java

@@ -1,18 +1,22 @@
 package com.xzzn.common.enums;
 
 /**
- * pcs-设备状态
+ * device-通信状态
  * 
  * @author xzzn
  */
-public enum DeviceStatus
+public enum DeviceRunningStatus
 {
-    ONLINE("0", "在线"), OFFLINE("1", "离线"), UNDER_REPAIR("2", "维修中");
+    OFFLINE("0", "离线"),
+    STANDBY("1", "待机") ,
+    RUNNING("2", "运行"),
+    FAULT("3", "故障"),
+    SHUTDOWN("4", "停机");
 
     private final String code;
     private final String info;
 
-    DeviceStatus(String code, String info)
+    DeviceRunningStatus(String code, String info)
     {
         this.code = code;
         this.info = info;

ems-common/src/main/java/com/xzzn/common/enums/ProtPlanStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * 告警保护方案状态
+ * 
+ * @author xzzn
+ */
+public enum ProtPlanStatus
+{
+    STOP(0L, "未启用"), RUNNING(1L, "已启用");
+
+    private final Long code;
+    private final String info;
+
+    ProtPlanStatus(Long code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Long getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/StrategyStatus.java

@@ -7,7 +7,7 @@ package com.xzzn.common.enums;
  */
 public enum StrategyStatus
 {
-    NOT_ENABLED("0", "未启用"), RUNNING("1", "已运行"),SUSPENDED("2", "已暂停"), DISABLE("1", "禁用"),DELETE("2", "删除");
+    NOT_ENABLED("0", "未启用"), RUNNING("1", "已运行"),SUSPENDED("2", "已暂停"), DISABLE("3", "禁用"),DELETE("4", "删除");
 
     private final String code;
     private final String info;

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

@@ -631,7 +631,7 @@ public class DDSDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
         pcsData.setDataUpdateTime(new Date());
         pcsData.setWorkStatus(WorkStatus.NORMAL.getCode());
         pcsData.setGridStatus(GridStatus.GRID.getCode());
-        pcsData.setDeviceStatus(DeviceStatus.ONLINE.getCode());
+        pcsData.setDeviceStatus(DeviceRunningStatus.RUNNING.getCode());
         pcsData.setControlMode(ControlModeStatus.REMOTE.getCode());
 
         // 电流

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

@@ -438,7 +438,7 @@ public class FXXDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
         pcsData.setDataUpdateTime(dataUpdateTime);
         pcsData.setWorkStatus(WorkStatus.NORMAL.getCode());
         pcsData.setGridStatus(GridStatus.GRID.getCode());
-        pcsData.setDeviceStatus(DeviceStatus.ONLINE.getCode());
+        pcsData.setDeviceStatus(DeviceRunningStatus.RUNNING.getCode());
         pcsData.setControlMode(ControlModeStatus.REMOTE.getCode());
 
         // 功率与能量类字段