Merge remote-tracking branch 'origin/master'

signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatus4StaticSchemeTask.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  * @description 从信号机方案模拟信号机灯态
  * @date 2023/12/01 10:28
  */
-@Component
+//@Component
 @Slf4j
 @SuppressWarnings("unused")
 public class SignalStatus4StaticSchemeTask {
@@ -48,7 +48,7 @@ public class SignalStatus4StaticSchemeTask {
     @Resource
     private CrossLightsMapper crossLightsMapper;
 
-    @Scheduled(fixedRate = 1000)
+    //@Scheduled(fixedRate = 1000)
     public void signalStatusCountDown() throws Exception {
         try {
             if (!currentCrossLightStatusCache.isEmpty()) {

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

@@ -138,10 +138,12 @@ public class SignalStatusTask {
                 if (Objects.nonNull(lightsStatusVO)) {
                     machineTimestamp = lightsStatusVO.getTimeStamp();
                     long offsetTime = start - Long.valueOf(machineTimestamp);
-                    if (offsetTime < 1000 * 10) {
+                    if (offsetTime < 1000 * 12) {
                         status = 1;
                     }
                     runMode = lightsStatusVO.getRunMode();
+                    log.error("当前路口：{}，当前信号机状态时间差：{}， 当前控制模式:{}, 当前在线离线状态：{}",
+                            crossId, offsetTime, runMode, status);
                 }
             }
         }