From 75bd5f6bf2b37689f90e96f1e4dd7acc3a924ade Mon Sep 17 00:00:00 2001 From: mashili Date: Tue, 28 Oct 2025 10:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=AB=99=E7=9B=91=E6=8E=A7-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E5=90=8C=E8=AE=BE=E5=A4=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/CommunicationStatus.java | 2 +- ...ceStatus.java => DeviceRunningStatus.java} | 12 +++++--- .../com/xzzn/common/enums/ProtPlanStatus.java | 30 +++++++++++++++++++ .../com/xzzn/common/enums/StrategyStatus.java | 2 +- .../impl/DDSDataProcessServiceImpl.java | 2 +- .../impl/FXXDataProcessServiceImpl.java | 2 +- 6 files changed, 42 insertions(+), 8 deletions(-) rename ems-common/src/main/java/com/xzzn/common/enums/{DeviceStatus.java => DeviceRunningStatus.java} (56%) create mode 100644 ems-common/src/main/java/com/xzzn/common/enums/ProtPlanStatus.java diff --git a/ems-common/src/main/java/com/xzzn/common/enums/CommunicationStatus.java b/ems-common/src/main/java/com/xzzn/common/enums/CommunicationStatus.java index 40b7d48..07ddf60 100644 --- a/ems-common/src/main/java/com/xzzn/common/enums/CommunicationStatus.java +++ b/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; diff --git a/ems-common/src/main/java/com/xzzn/common/enums/DeviceStatus.java b/ems-common/src/main/java/com/xzzn/common/enums/DeviceRunningStatus.java similarity index 56% rename from ems-common/src/main/java/com/xzzn/common/enums/DeviceStatus.java rename to ems-common/src/main/java/com/xzzn/common/enums/DeviceRunningStatus.java index 07b41af..c71850b 100644 --- a/ems-common/src/main/java/com/xzzn/common/enums/DeviceStatus.java +++ b/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; diff --git a/ems-common/src/main/java/com/xzzn/common/enums/ProtPlanStatus.java b/ems-common/src/main/java/com/xzzn/common/enums/ProtPlanStatus.java new file mode 100644 index 0000000..588cb5e --- /dev/null +++ b/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; + } +} diff --git a/ems-common/src/main/java/com/xzzn/common/enums/StrategyStatus.java b/ems-common/src/main/java/com/xzzn/common/enums/StrategyStatus.java index c77a0af..ed3b256 100644 --- a/ems-common/src/main/java/com/xzzn/common/enums/StrategyStatus.java +++ b/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; diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java index 80744ee..b7cad26 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java +++ b/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()); // 电流 diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java index fb0665f..8aad846 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java +++ b/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()); // 功率与能量类字段