[update] 优化倒计时行人

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

@@ -122,9 +122,12 @@ public class HisensePhaseCountDownTask {
                                         }
                                         Integer type = lightsPOS.get(0).getType();
                                         redCountDown = changePhaseTime - runtime - phaseTime;
-                                        if (redCountDown < 0) {
+                                        if (redCountDown <= 0) {
                                             redCountDown = cycleLen - runtime;
                                         }
+                                        //if (redCountDown <= 0) {
+                                        //    redCountDown = 1;
+                                        //}
                                         if (type == 2) { // 圆饼灯
                                             List<Integer> dirList = Arrays.asList(1, 2, 3);
                                             for (Integer commonTurn : dirList) {
@@ -143,7 +146,7 @@ public class HisensePhaseCountDownTask {
                                             }
                                         }
                                     }
-                                    phaseMap.put(String.valueOf(dir), turnCountDown);
+                                    setPhaseMap(phaseMap, dir, turnCountDown);
                                 }
                             } else {
                                 Integer cyclePhaseCountDown = lightsStatusVO.getCyclePhaseCountDown();
@@ -178,7 +181,7 @@ public class HisensePhaseCountDownTask {
                                             }
                                         }
                                     }
-                                    phaseMap.put(String.valueOf(dir), turnCountDown);
+                                    setPhaseMap(phaseMap, dir, turnCountDown);
                                 }
                             }
                         }
@@ -189,6 +192,23 @@ public class HisensePhaseCountDownTask {
         lightsStatusVO.setPhaseMap(phaseMap);
     }
 
+    /**
+     * 统一方向转向倒计时
+     * @param phaseMap
+     * @param dir
+     * @param turnCountDown
+     */
+    private static void setPhaseMap(Map<String, Object> phaseMap, Integer dir, Map<Integer, Integer> turnCountDown) {
+        String dirStr = String.valueOf(dir);
+        if (!phaseMap.isEmpty() && Objects.nonNull(phaseMap.get(dirStr))) {
+            Map<Integer, Integer> turnCountDownCahce = (Map<Integer, Integer>) phaseMap.get(dirStr);
+            turnCountDownCahce.putAll(turnCountDown);
+            phaseMap.put(String.valueOf(dir), turnCountDown);
+        } else {
+            phaseMap.put(String.valueOf(dir), turnCountDown);
+        }
+    }
+
     /**
      * @param crossId
      * @param lightsStatusVO
@@ -200,6 +220,7 @@ public class HisensePhaseCountDownTask {
             List<CrossPhasePO> nextSchemePhaseList = crossPhaseMapper.selectByCrossIdAndPlanId(crossId, String.valueOf(crossSchemePO.getId()));
             Integer phaseTime = 0;
             String phaseId = null;
+
             if (!CollectionUtils.isEmpty(nextSchemePhaseList)) {
                 for (CrossPhasePO crossPhasePO : nextSchemePhaseList) {
                     if (Objects.equals(1, crossPhasePO.getSort())) {
@@ -357,7 +378,7 @@ public class HisensePhaseCountDownTask {
                 turnColor.put(turn, "red");
             }
         }
-        if (cyclePhaseCountDown < redTime) {
+        if (cyclePhaseCountDown <= redTime) {
             color = "red";
             if (turn == 20) {
                 turnColor.put(turn, "green");