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

平台修改意见20251120-调整表ems_devices_setting字段running_status为device_status，与表ems_pcs_data字段device_status保持一致

Browse Source
This commit is contained in:
zq
2025-12-12 10:47:21 +08:00
parent 73c668709a
commit 0e1c7f52f1
7 changed files with 86 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java
View File

@ -51,7 +51,7 @@ public class ModbusPoller {
public void pollAllDevices() {
logger.info("开始执行Modbus设备轮询...");
EmsDevicesSetting selectEntity = new EmsDevicesSetting();
selectEntity.setRunningStatus(DeviceRunningStatus.RUNNING.getCode());
selectEntity.setDeviceStatus(DeviceRunningStatus.RUNNING.getCode());
List<EmsDevicesSetting> activeDevices = deviceRepo.selectEmsDevicesSettingList(selectEntity);
EmsDevicesSetting device = activeDevices.get(0);
@ -103,8 +103,8 @@ public class ModbusPoller {
}
// 设备轮询不到修改运行状态
String beforeStatus = device.getRunningStatus();
device.setRunningStatus(DeviceRunningStatus.SHUTDOWN.getCode());
String beforeStatus = device.getDeviceStatus();
device.setDeviceStatus(DeviceRunningStatus.SHUTDOWN.getCode());
emsDeviceSettingServiceImpl.updateDevice(device);
// 轮询设备，设备状态变更日志
@ -117,16 +117,16 @@ public class ModbusPoller {
// 处理获取到的数据
private void processData(EmsDevicesSetting device, int[] data) throws MqttException {
String beforeStatus = device.getRunningStatus();
String beforeStatus = device.getDeviceStatus();
Boolean error = true;
if (data == null || data.length == 0) {
logger.warn("设备{}返回空数据", device.getId());
// 设备读取不到-设置设备故障
device.setRunningStatus(DeviceRunningStatus.FAULT.getCode());
device.setDeviceStatus(DeviceRunningStatus.FAULT.getCode());
error = false;
} else {
// 恢复设备状态 - 运行
device.setRunningStatus(DeviceRunningStatus.RUNNING.getCode());
device.setDeviceStatus(DeviceRunningStatus.RUNNING.getCode());
}
emsDeviceSettingServiceImpl.updateDevice(device);
// 轮询设备，设备状态变更日志
@ -171,7 +171,7 @@ public class ModbusPoller {
log.setSiteId(device.getSiteId());
log.setDeviceId(device.getDeviceId());
log.setBeforeStatus(beforeStatus);
log.setAfterStatus(device.getRunningStatus());
log.setAfterStatus(device.getDeviceStatus());
log.setCreateBy("sys");
log.setCreateTime(new Date());
return log;