Commit 0e26dcd5 authored by duanruiming's avatar duanruiming

[update] 删除测试日志

parent 6e61ef46
...@@ -41,7 +41,7 @@ public class CommonEventWarnTask { ...@@ -41,7 +41,7 @@ public class CommonEventWarnTask {
@Autowired @Autowired
private TDeviceStatusMapper tDeviceStatusMapper; private TDeviceStatusMapper tDeviceStatusMapper;
@Scheduled(fixedRate = 1 * 60 * 1000) @Scheduled(fixedRate = 30 * 1000)
public void pushEvenWarnData() { public void pushEvenWarnData() {
try { try {
Set<WebSocketServer> events = WebSocketServer.getWebSocketSet(Constant.WEBSOCKET_TOPIC_EVENT_WARN); Set<WebSocketServer> events = WebSocketServer.getWebSocketSet(Constant.WEBSOCKET_TOPIC_EVENT_WARN);
...@@ -83,9 +83,7 @@ public class CommonEventWarnTask { ...@@ -83,9 +83,7 @@ public class CommonEventWarnTask {
*/ */
private JsonViewObject getSignalWarnData() { private JsonViewObject getSignalWarnData() {
List<CommonEventAlarmOutVo> results = new ArrayList<>(); List<CommonEventAlarmOutVo> results = new ArrayList<>();
log.info("=============信号机告警===============");
JsonViewObject jsonViewObject = utcFeignClients.runningStatusAlarm(); JsonViewObject jsonViewObject = utcFeignClients.runningStatusAlarm();
log.info("=============信号机告警jsonViewObject==============:{}", jsonViewObject);
if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) { if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
return jsonViewObject.fail("信号机告警UTC服务调用异常!"); return jsonViewObject.fail("信号机告警UTC服务调用异常!");
...@@ -93,7 +91,6 @@ public class CommonEventWarnTask { ...@@ -93,7 +91,6 @@ public class CommonEventWarnTask {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String formatNow = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(now); String formatNow = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(now);
List<Map<String, Object>> content = (List<Map<String, Object>>) jsonViewObject.getContent(); List<Map<String, Object>> content = (List<Map<String, Object>>) jsonViewObject.getContent();
log.info("=============信号机告警:{}", content);
content.forEach(map -> { content.forEach(map -> {
Map<String, Object> result = map; Map<String, Object> result = map;
String signalId = (String) result.get("signalId"); String signalId = (String) result.get("signalId");
......
...@@ -36,7 +36,7 @@ public class SignalStatusTask { ...@@ -36,7 +36,7 @@ public class SignalStatusTask {
private final ControlHistMapper controlHistMapper; private final ControlHistMapper controlHistMapper;
private final TDeviceStatusLogMapper tDeviceStatusLogMapper; private final TDeviceStatusLogMapper tDeviceStatusLogMapper;
@Scheduled(fixedRate = 2 * 60 * 1000) @Scheduled(fixedRate = 1 * 60 * 1000)
@Transactional @Transactional
public void syncSignalStatus() { public void syncSignalStatus() {
try { try {
...@@ -47,7 +47,6 @@ public class SignalStatusTask { ...@@ -47,7 +47,6 @@ public class SignalStatusTask {
} }
List<Map<String, Object>> source = (List<Map<String, Object>>) jsonViewObject.getContent(); List<Map<String, Object>> source = (List<Map<String, Object>>) jsonViewObject.getContent();
List<SignalStatusVO> content = BeanMapUtils.mapsToObjects(source, SignalStatusVO.class); List<SignalStatusVO> content = BeanMapUtils.mapsToObjects(source, SignalStatusVO.class);
log.info("SignalStatusVOTOMap: {}", content);
content.forEach(signalStatusVO -> { content.forEach(signalStatusVO -> {
String signalId = signalStatusVO.getSignalId(); String signalId = signalStatusVO.getSignalId();
String crossId = signalStatusVO.getCrossId(); String crossId = signalStatusVO.getCrossId();
...@@ -59,7 +58,6 @@ public class SignalStatusTask { ...@@ -59,7 +58,6 @@ public class SignalStatusTask {
if (StringUtils.isNotEmpty(crossId)) { if (StringUtils.isNotEmpty(crossId)) {
lambdaQueryWrapper.eq(TDeviceStatusInfo::getCode, crossId); lambdaQueryWrapper.eq(TDeviceStatusInfo::getCode, crossId);
TDeviceStatusInfo tDeviceStatusInfo = tDeviceStatusMapper.selectOne(lambdaQueryWrapper); TDeviceStatusInfo tDeviceStatusInfo = tDeviceStatusMapper.selectOne(lambdaQueryWrapper);
log.info("TDeviceStatusInfo::getCode: {}", tDeviceStatusInfo.getCode());
if (isExucuteUpdate(currentSignalStatus, currentFaultType, tDeviceStatusInfo)) { if (isExucuteUpdate(currentSignalStatus, currentFaultType, tDeviceStatusInfo)) {
tDeviceStatusInfo.setStatus(currentSignalStatus); tDeviceStatusInfo.setStatus(currentSignalStatus);
......
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