Commit dd30f23b authored by duanruiming's avatar duanruiming

[update] 控制模式表更新逻辑优化

parent 0783e5a6
...@@ -74,7 +74,6 @@ public class SignalStatusTask { ...@@ -74,7 +74,6 @@ public class SignalStatusTask {
} }
// 更新数据库状态 // 更新数据库状态
updateSignalStatus(signalStatusVO, crossId, name, currentSignalStatus, currentFaultType, results); updateSignalStatus(signalStatusVO, crossId, name, currentSignalStatus, currentFaultType, results);
insertControlHist(signalStatusVO);
log.info("更新信号机状态成功,{}", currentSignalStatus); log.info("更新信号机状态成功,{}", currentSignalStatus);
}); });
long end = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")); long end = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
...@@ -127,6 +126,7 @@ public class SignalStatusTask { ...@@ -127,6 +126,7 @@ public class SignalStatusTask {
insertDeviceStatusLog(signalStatusVO, crossId, currentSignalStatus, currentFaultType, name); insertDeviceStatusLog(signalStatusVO, crossId, currentSignalStatus, currentFaultType, name);
// 信号机状态发生改变,进行告警通知 // 信号机状态发生改变,进行告警通知
buildSignalWarnData(results, crossId, currentSignalStatus, currentFaultType, name); buildSignalWarnData(results, crossId, currentSignalStatus, currentFaultType, name);
insertControlHist(signalStatusVO);
} }
} else { } else {
TDeviceStatusInfo deviceStatusInfo = new TDeviceStatusInfo(); TDeviceStatusInfo deviceStatusInfo = new TDeviceStatusInfo();
...@@ -150,7 +150,7 @@ public class SignalStatusTask { ...@@ -150,7 +150,7 @@ public class SignalStatusTask {
private void insertControlHist(SignalStatusVO signalStatusVO) { private void insertControlHist(SignalStatusVO signalStatusVO) {
// 手动控制控制历史表 // 手动控制控制历史表
Map<String, Boolean> centerControlMap = ControlModeConst.centerControlMap; Map<String, Boolean> centerControlMap = ControlModeConst.centerControlMap;
if (!centerControlMap.isEmpty() && !centerControlMap.get(signalStatusVO.getCrossId())) { if (centerControlMap.isEmpty() || (!centerControlMap.isEmpty() && !centerControlMap.get(signalStatusVO.getCrossId()))) {
String crossId = signalStatusVO.getCrossId(); String crossId = signalStatusVO.getCrossId();
Integer controlType = signalStatusVO.getControlType(); Integer controlType = signalStatusVO.getControlType();
TCrossControlHist tCrossControlHist = controlHistMapper.selectRecentOne(crossId); TCrossControlHist tCrossControlHist = controlHistMapper.selectRecentOne(crossId);
......
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