[update] 优化海信灯态车道灯态问题2

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/cache/SignalDataCache.java

@@ -24,5 +24,4 @@ public class SignalDataCache {
     public static final Map<String, RunningLightsStatusPojo> runningStateInfoCacheUdp = new HashMap<>();
     public static final Map<String, LightsStatusVO> runningStateInfoCache = new HashMap<>();
     public static final Map<String, Long> runningStatusStampMap = new HashMap<>();
-    public static final Map<String, Integer> currentCrossPhaseNoRunPhaseTimeMap = new HashMap<>();
 }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/SignalStatusServiceImpl.java

@@ -153,8 +153,8 @@ public class SignalStatusServiceImpl implements SignalStatusService {
                         }
                         Date date = new Date();
                         Long time = date.getTime();
-                        int offsetTime = (int) ((time - signalMachineStamp) / 1000);
-                        int cycleCountDown = content.getCycleCountDown() - offsetTime;
+                        int offsetTime = (int) ((time - signalMachineStamp) / 1000) - 6; //37.12.182.29服务器比北京时间快6秒
+                        int cycleCountDown = content.getCycleCountDown() - Math.max(offsetTime, 0);
                         int hiControlMode = content.getControlMode();
                         int period = content.getPeriod();
                         int runTime = period - cycleCountDown;
@@ -204,7 +204,6 @@ public class SignalStatusServiceImpl implements SignalStatusService {
                         Integer changePhaseTime = phaseCountDownDTO.getChangePhaseTime();
                         if (lastPhaseCountTime <= runTime && runTime < changePhaseTime) {
                             phaseTimeCountDown = changePhaseTime - runTime;
-                            SignalDataCache.currentCrossPhaseNoRunPhaseTimeMap.put(crossId, phaseTimeCountDown);
                             break;
                         }
                         lastPhaseCountTime = changePhaseTime;