Commit 3823596a authored by duanruiming's avatar duanruiming

[update] 优化圆饼灯处理,不需要此代码

parent 2d0df2e2
...@@ -478,17 +478,17 @@ public class SignalStatus4StaticSchemeTask { ...@@ -478,17 +478,17 @@ public class SignalStatus4StaticSchemeTask {
if (!CollectionUtils.isEmpty(crossPhaseDirTurnCache)) { if (!CollectionUtils.isEmpty(crossPhaseDirTurnCache)) {
Map<String, Object> dirLampGroupMap = new HashMap<>(); Map<String, Object> dirLampGroupMap = new HashMap<>();
setPhaseLampColor(crossId, currentSchemeNo, currentPhaseNo, cyclePhaseCountDown, crossPhaseDirTurnCache, dirLampGroupMap); setPhaseLampColor(crossId, currentSchemeNo, currentPhaseNo, cyclePhaseCountDown, crossPhaseDirTurnCache, dirLampGroupMap);
// 海信,箭头灯变圆饼灯 //// 海信,箭头灯变圆饼灯
for (Map.Entry<String, Object> arrowEntry : dirLampGroupMap.entrySet()) { //for (Map.Entry<String, Object> arrowEntry : dirLampGroupMap.entrySet()) {
String dir = arrowEntry.getKey(); // String dir = arrowEntry.getKey();
Map<Integer, String> turnColor = (Map<Integer, String>) arrowEntry.getValue(); // Map<Integer, String> turnColor = (Map<Integer, String>) arrowEntry.getValue();
if (!turnColor.isEmpty() && !turnColor.containsKey(1)) { // if (!turnColor.isEmpty() && !turnColor.containsKey(1)) {
// 如果不包含左转, 左转灯色为直行 // // 如果不包含左转, 左转灯色为直行
String straightColor = turnColor.get(2); // String straightColor = turnColor.get(2);
turnColor.put(1, straightColor); // turnColor.put(1, straightColor);
dirLampGroupMap.put(dir, turnColor); // dirLampGroupMap.put(dir, turnColor);
} // }
} //}
lightsStatusVO.setDirLampGroupMap(dirLampGroupMap); lightsStatusVO.setDirLampGroupMap(dirLampGroupMap);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment