[update] 优化告警数据和页面统计联动

signal-control-service/src/main/java/net/wanji/web/task/CommonEventWarnTask.java

@@ -14,7 +14,6 @@ import net.wanji.web.mapper.TDeviceStatusMapper;
 import net.wanji.web.service.SituationDetectionService;
 import net.wanji.web.vo.situationDetection.CommonEventAlarmOutVo;
 import net.wanji.web.websocket.WebSocketServer;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -38,7 +37,6 @@ public class  CommonEventWarnTask {
     private final SituationDetectionService situationDetectionService;
     private final TDeviceStatusMapper tDeviceStatusMapper;
 
-    @Scheduled(fixedRate = 30 * 1000)
     public void pushEvenWarnData() {
         try {
             Set<WebSocketServer> events = WebSocketServer.getWebSocketSet(Constant.WEBSOCKET_TOPIC_EVENT_WARN);

signal-control-service/src/main/java/net/wanji/web/task/SignalStatusTask.java

@@ -37,11 +37,13 @@ public class SignalStatusTask {
     private final ControlHistMapper controlHistMapper;
     private final TDeviceStatusLogMapper tDeviceStatusLogMapper;
     private final BaseCrossInfoMapper baseCrossInfoMapper;
+    private final CommonEventWarnTask commonEventWarnTask;
 
     @Scheduled(fixedRate = 30 * 1000)
     @Transactional
     public void syncSignalStatus() {
         try {
+
             JsonViewObject jsonViewObject = utcFeignClients.runningStatusAlarm();
             if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
                 log.error("定时任务同步信号机设备状态utcService调用异常");
@@ -71,6 +73,9 @@ public class SignalStatusTask {
                 updateSignalStatus(signalStatusVO, crossId, name, currentSignalStatus, currentFaultType);
                 insertControlHist(signalStatusVO);
             });
+
+            // 远程同步状态后，推送告警事件
+            commonEventWarnTask.pushEvenWarnData();
         } catch (Exception e) {
             log.error("定时任务同步信号机设备状态远程utcService调用异常", e);
         }