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

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

@@ -15,7 +15,9 @@ import net.wanji.web.entity.TDeviceStatusLog;
 import net.wanji.web.mapper.ControlHistMapper;
 import net.wanji.web.mapper.TDeviceStatusLogMapper;
 import net.wanji.web.mapper.TDeviceStatusMapper;
+import net.wanji.web.service.SituationDetectionService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Propagation;
@@ -39,6 +41,8 @@ public class SignalStatusTask {
     private final TDeviceStatusLogMapper tDeviceStatusLogMapper;
     private final BaseCrossInfoMapper baseCrossInfoMapper;
     private final CommonEventWarnTask commonEventWarnTask;
+    @Autowired
+    SituationDetectionService situationDetectionService;
 
     @Scheduled(fixedRate = 30 * 1000)
     @Transactional
@@ -75,7 +79,7 @@ public class SignalStatusTask {
                 // 更新数据库状态
                 updateSignalStatus(signalStatusVO, crossId, name, currentSignalStatus, currentFaultType);
                 insertControlHist(signalStatusVO);
-                log.info("更新信号机状态成功");
+                log.info("更新信号机状态成功，{}", currentSignalStatus);
             });
             extracted();
 
@@ -86,10 +90,8 @@ public class SignalStatusTask {
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void extracted() {
-        LambdaQueryWrapper<TDeviceStatusInfo> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        objectLambdaQueryWrapper.eq(TDeviceStatusInfo::getStatus, 1);
-        int size = tDeviceStatusMapper.selectList(objectLambdaQueryWrapper).size();
-        log.info("当前设备在线数量：{}", size);
+        Map<String, Map<String, Integer>> stringMapMap = situationDetectionService.allDeviceStatus(null);
+        log.info("当前设备在线数量：{}", stringMapMap.toString());
     }
 
     private static String getSignalName(List<BaseCrossInfoPO> finalBaseCrossInfoPOList, String crossId) {