xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +40756 -1055
285 changed files with 40756 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 75bd5f6bf2 - Show all commits

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

@ -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;

12
ems-common/src/main/java/com/xzzn/common/enums/DeviceStatus.java → ems-common/src/main/java/com/xzzn/common/enums/DeviceRunningStatus.java
View File

@ -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;

30
ems-common/src/main/java/com/xzzn/common/enums/ProtPlanStatus.java Normal file
View File

@ -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;
}
}

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

@ -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;

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

@ -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());
// 电流

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

@ -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());
// 功率与能量类字段