[update] 灯组号和通道数组下标对应

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

@@ -19,46 +19,46 @@ public class ComplexCrossCache {
 
         // 旅游路与转山西路交叉口
         Map<Integer, Integer> turnInnerMap13NI00B5RM0 = new HashMap<>();
-        turnInnerMap13NI00B5RM0.put(2, 1);
-        turnInnerMap13NI00B5RM0.put(6, 2);
-        turnInnerMap13NI00B5RM0.put(14, 2);
-        turnInnerMap13NI00B5RM0.put(15, 1);
-        turnInnerMap13NI00B5RM0.put(8, 20);
-        turnInnerMap13NI00B5RM0.put(12, 20);
+        turnInnerMap13NI00B5RM0.put(1, 1);
+        turnInnerMap13NI00B5RM0.put(5, 2);
+        turnInnerMap13NI00B5RM0.put(13, 2);
+        turnInnerMap13NI00B5RM0.put(14, 1);
+        turnInnerMap13NI00B5RM0.put(7, 20);
+        turnInnerMap13NI00B5RM0.put(11, 20);
         turnCacheMap.put("13NI00B5RM0", turnInnerMap13NI00B5RM0);
         Map<Integer, Integer> dirInnerMap13NI00B5RM0 = new HashMap<>();
-        dirInnerMap13NI00B5RM0.put(2, 1);
-        dirInnerMap13NI00B5RM0.put(6, 3);
+        dirInnerMap13NI00B5RM0.put(1, 1);
+        dirInnerMap13NI00B5RM0.put(5, 3);
+        dirInnerMap13NI00B5RM0.put(13, 7);
         dirInnerMap13NI00B5RM0.put(14, 7);
-        dirInnerMap13NI00B5RM0.put(15, 7);
-        dirInnerMap13NI00B5RM0.put(8, 1);
-        dirInnerMap13NI00B5RM0.put(12, 3);
+        dirInnerMap13NI00B5RM0.put(7, 1);
+        dirInnerMap13NI00B5RM0.put(11, 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(1, 1);
+        dirInnerMap13NGH0B5RC0.put(3, 6);
+        dirInnerMap13NGH0B5RC0.put(4, 3);
+        dirInnerMap13NGH0B5RC0.put(5, 1);
+        dirInnerMap13NGH0B5RC0.put(7, 1);
+        dirInnerMap13NGH0B5RC0.put(9, 5);
+        dirInnerMap13NGH0B5RC0.put(11, 3);
+        dirInnerMap13NGH0B5RC0.put(12, 6);
         dirInnerMap13NGH0B5RC0.put(13, 6);
-        dirInnerMap13NGH0B5RC0.put(14, 6);
-        dirInnerMap13NGH0B5RC0.put(16, 5);
+        dirInnerMap13NGH0B5RC0.put(15, 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);
+        dirInnerMap13NF80B5QN0.put(1, 1);
+        dirInnerMap13NF80B5QN0.put(3, 6);
+        dirInnerMap13NF80B5QN0.put(5, 2);
+        dirInnerMap13NF80B5QN0.put(7, 1);
+        dirInnerMap13NF80B5QN0.put(9, 4);
+        dirInnerMap13NF80B5QN0.put(11, 2);
+        dirInnerMap13NF80B5QN0.put(13, 6);
+        dirInnerMap13NF80B5QN0.put(15, 4);
         dirCacheMap.put("13NF80B5QN0", dirInnerMap13NF80B5QN0);
     }
 

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

@@ -89,16 +89,16 @@ public class CommonUtils {
     public static Integer getTurnByLightsId(Integer lightId) {
         Integer turn = null;
         if (lightId % 4 == 0) {
-            turn = 20;
+            turn = 1;
         }
         if (lightId % 4 == 1) {
-            turn = 1;
+            turn = 2;
         }
         if (lightId % 4 == 2) {
-            turn = 2;
+            turn = 3;
         }
         if (lightId % 4 == 3) {
-            turn = 3;
+            turn = 20;
         }
         return turn;
     }