Commit 358971d8 authored by duanruiming's avatar duanruiming

[update] 信号机离线上线

parent 79f9215c
...@@ -110,7 +110,7 @@ public class CommonEventWarnTask { ...@@ -110,7 +110,7 @@ public class CommonEventWarnTask {
TDeviceStatusInfo tDeviceStatusInfo = tDeviceStatusMapper.selectOne(queryWrapper.eq("code", crossId)); TDeviceStatusInfo tDeviceStatusInfo = tDeviceStatusMapper.selectOne(queryWrapper.eq("code", crossId));
if (Objects.nonNull(tDeviceStatusInfo)) { if (Objects.nonNull(tDeviceStatusInfo)) {
faultTypeDB = tDeviceStatusInfo.getFaultType(); faultTypeDB = tDeviceStatusInfo.getFaultType();
statusDB = tDeviceStatusInfo.getStatus(); statusDB = tDeviceStatusInfo.getStatus() == 2 ? 1 : tDeviceStatusInfo.getStatus();
crossName = tDeviceStatusInfo.getName(); crossName = tDeviceStatusInfo.getName();
} }
} }
...@@ -119,11 +119,15 @@ public class CommonEventWarnTask { ...@@ -119,11 +119,15 @@ public class CommonEventWarnTask {
commonEventAlarmOutVo.setEventType(3); commonEventAlarmOutVo.setEventType(3);
commonEventAlarmOutVo.setEventId(signalId); commonEventAlarmOutVo.setEventId(signalId);
commonEventAlarmOutVo.setEventName(crossName); commonEventAlarmOutVo.setEventName(crossName);
commonEventAlarmOutVo.setEventDesc(crossName.concat("信号机告警"));
if (currentStatus == 0) { if (currentStatus == 0) {
commonEventAlarmOutVo.setStatus("11"); commonEventAlarmOutVo.setStatus("11");
commonEventAlarmOutVo.setEventDesc(crossName.concat("信号机离线"));
} else if (currentStatus == 1){
commonEventAlarmOutVo.setStatus(String.valueOf(0));
commonEventAlarmOutVo.setEventDesc(crossName.concat("信号机上线"));
} else { } else {
commonEventAlarmOutVo.setStatus(String.valueOf(currentFaultType)); commonEventAlarmOutVo.setStatus(String.valueOf(currentFaultType));
commonEventAlarmOutVo.setEventDesc(crossName.concat("信号机故障"));
} }
commonEventAlarmOutVo.setStartTime(formatNow); commonEventAlarmOutVo.setStartTime(formatNow);
commonEventAlarmOutVo.setCoordinate(coordinate); commonEventAlarmOutVo.setCoordinate(coordinate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment