[update] 单独适配旅游路与霞景路、洪山路通道号

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

@@ -34,6 +34,32 @@ public class ComplexCrossCache {
         dirInnerMap13NI00B5RM0.put(8, 1);
         dirInnerMap13NI00B5RM0.put(12, 3);
         dirCacheMap.put("13NI00B5RM0", dirInnerMap13NI00B5RM0);
+
+        // 旅游路与洪山路交叉口
+        Map<Integer, Integer> dirInnerMap13NGH0B5RC0 = new HashMap<>();
+        dirInnerMap13NGH0B5RC0.put(2, 1);
+        dirInnerMap13NGH0B5RC0.put(4, 6);
+        dirInnerMap13NGH0B5RC0.put(5, 3);
+        dirInnerMap13NGH0B5RC0.put(6, 1);
+        dirInnerMap13NGH0B5RC0.put(8, 1);
+        dirInnerMap13NGH0B5RC0.put(10, 5);
+        dirInnerMap13NGH0B5RC0.put(12, 3);
+        dirInnerMap13NGH0B5RC0.put(13, 6);
+        dirInnerMap13NGH0B5RC0.put(14, 6);
+        dirInnerMap13NGH0B5RC0.put(16, 5);
+        dirCacheMap.put("13NGH0B5RC0", dirInnerMap13NGH0B5RC0);
+
+        // 旅游路与霞景路交叉口
+        Map<Integer, Integer> dirInnerMap13NF80B5QN0 = new HashMap<>();
+        dirInnerMap13NF80B5QN0.put(2, 1);
+        dirInnerMap13NF80B5QN0.put(4, 6);
+        dirInnerMap13NF80B5QN0.put(6, 2);
+        dirInnerMap13NF80B5QN0.put(8, 1);
+        dirInnerMap13NF80B5QN0.put(10, 4);
+        dirInnerMap13NF80B5QN0.put(12, 2);
+        dirInnerMap13NF80B5QN0.put(14, 6);
+        dirInnerMap13NF80B5QN0.put(16, 4);
+        dirCacheMap.put("13NF80B5QN0", dirInnerMap13NF80B5QN0);
     }
 
     public static Map<String, Map<Integer, Integer>> getTurnCacheMap() {

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/util/CommonUtils.java

@@ -81,7 +81,7 @@ public class CommonUtils {
     }
 
     /**
-     * 通过灯组编号获取灯组转向， 1 左转 2 直右 3 右 4 行人
+     * 通过灯组编号获取灯组转向， 1 左转 2 直 3 右 20 行人
      *
      * @param lightId
      * @return
@@ -89,16 +89,16 @@ public class CommonUtils {
     public static Integer getTurnByLightsId(Integer lightId) {
         Integer turn = null;
         if (lightId % 4 == 0) {
-            turn = 1;
+            turn = 20;
         }
         if (lightId % 4 == 1) {
-            turn = 2;
+            turn = 1;
         }
         if (lightId % 4 == 2) {
-            turn = 3;
+            turn = 2;
         }
         if (lightId % 4 == 3) {
-            turn = 20;
+            turn = 3;
         }
         return turn;
     }