[update] 优化圆饼灯处理逻辑，忽略行人灯组

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

@@ -377,8 +377,10 @@ public class HisensePhaseCountDownTask {
                 color = setTurnColor(cyclePhaseCountDown, yellowTime, redTime, turnColor, color, turn);
                 turnColor.put(turn, color);
             }
-            List<CrossLightsPO> dirAllLights = crossLightsPOS.stream().filter(po -> Objects.equals(po.getDir(), dirEntry.getKey())).collect(Collectors.toList());
-            if (type == 2) { // 方向是圆饼灯，并且只有一个灯组
+            List<CrossLightsPO> dirAllLights = crossLightsPOS.stream()
+                    .filter(po -> Objects.equals(po.getDir(), dirEntry.getKey()) && !Objects.equals(po.getType(), 3))
+                    .collect(Collectors.toList());
+            if (type == 2) { // 方向是圆饼灯，并且只有一个灯组，不包含行人
                 if (dirAllLights.size() == 1) {
                     setAllTurnColor(turnColor, color);
                 } else {

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

@@ -570,15 +570,17 @@ public class SignalStatus4StaticSchemeTask {
                 color = setTurnColor(cyclePhaseCountDown, yellowTime, redTime, turnColor, color, turn);
                 turnColor.put(turn, color);
             }
-            List<CrossLightsPO> dirAllLights = crossLightsPOS.stream().filter(po -> Objects.equals(po.getDir(), dirEntry.getKey())).collect(Collectors.toList());
+            List<CrossLightsPO> dirAllLights = crossLightsPOS.stream()
+                    .filter(po -> Objects.equals(po.getDir(), dirEntry.getKey()) && !Objects.equals(po.getType(), 3))
+                    .collect(Collectors.toList());
             if (type == 2) { // 方向是圆饼灯，并且只有一个灯组
                 if (dirAllLights.size() == 1) {
                     setAllTurnColor(turnColor, color);
                 } else {
                     turnColor.put(2, "green");
-                    turnColor.put(3, "green"); // 右转常绿
                 }
             }
+            turnColor.put(3, "green"); // 右转常绿
             dirLampGroupMap.put(dir, turnColor);
         }
     }
@@ -638,7 +640,6 @@ public class SignalStatus4StaticSchemeTask {
                 turnColor.put(turn, color);
             }
         }
-        turnColor.put(3, "green"); // 右转常绿
     }
 
     /**