Merge remote-tracking branch 'origin/master'

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/common/HisenseTurnEnum.java

@@ -12,14 +12,14 @@ import java.util.Objects;
 @Getter
 @AllArgsConstructor
 public enum HisenseTurnEnum {
-     // '车道转向：1左转；2直行；3右转；4掉头；5直左；6直右；7左直右；8左右；9左转掉头；10直行掉头；
-     // 11右转掉头；12左直掉头；13直右掉头；14左直右掉头；15左右掉头', 0 默认没有匹配
+     // 万集:'车道转向：1左转；2直行；3右转；4掉头；5直左；6直右；7左直右；8左右；9左转掉头；10直行掉头；11右转掉头；12左直掉头；13直右掉头；14左直右掉头；15左右掉头', 0 默认没有匹配
+     // hisen:      1-左,2-直,3-右,4-调头,5-左调头,6-左直,7-左右,8-直右,9-左直右,10-直调头,11-入口行人,12-出口行人,13-出入口行人,14-左直调头,15-右掉头,16-左右掉头,17-直右掉头,18-左直右掉头
     TURN_1(1, 1, "左"),
     TURN_2(2, 2, "直"),
     TURN_3(3, 3, "右"),
     TURN_4(4, 4, "调头"),
     TURN_5(5, 9, "左调头"),
-    TURN_6(6, 12, "左直"),
+    TURN_6(6, 5, "左直"),
     TURN_7(7, 8, "左右"),
     TURN_8(8, 6, "直右"),
     TURN_9(9, 7, "左直右"),

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/ControlCommandServiceImpl.java

@@ -252,14 +252,13 @@ public class ControlCommandServiceImpl implements ControlCommandService {
 
                     }
                     messageContent.selectSingleNode(HttpConstants.COMMAND).setText("0");
-                    System.out.println(document.asXML());
                     //取消步进
                     long s1 = System.currentTimeMillis();
-//                    boolean isOk = sendMesIsOk(document.asXML());
+                    boolean isOk = sendMesIsOk(document.asXML());
                     long e1 = System.currentTimeMillis();
                     log.info("取消 相位步进 耗时: {} ms", e1 - s1);
 
-                    boolean isOk = true;
+//                    boolean isOk = true;
                     if (isOk) {
                         return jsonViewObject.success("相位步进成功，，路口号： " + code);
                     } else {

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/StaticInfoServiceImpl.java

@@ -491,10 +491,15 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                 //获取方向转向分组
                 List<String> binaryList = CommonUtils.groupStringFromRight(binaryString);
                 for (String readUtf8Line : binaryList) {
-                    String dir = readUtf8Line.substring(0, 3); // 高三位 方向
-                    String turn = readUtf8Line.substring(3); // 低五位 转向
+                    // 高三位 方向
+                    String dir = readUtf8Line.substring(0, 3);
+                    // 低五位 转向
+                    String turn = readUtf8Line.substring(3);
                     Integer wjLightsDir = HiseseDirEnum.getWjLightsDir(Integer.parseInt(dir, 2));
                     Integer wjLightsTurn = HisenseTurnEnum.getWjLightsTurn(Integer.parseInt(turn, 2));
+                    if (wjLightsDir == 0 || wjLightsTurn == 0){
+                        continue;
+                    }
                     Integer wjPerson = HisensePersonEntranceAndExitEnum.getWjperson(Integer.parseInt(turn, 2));
                     //灯组
                     CrossLightsPO crossLightsPO = new CrossLightsPO();

wj-common/src/main/java/net/wanji/common/utils/tool/ScheduleUtil.java

@@ -44,8 +44,13 @@ public class ScheduleUtil {
             char aChar = chars[i];
             if (aChar == 49) {
                 if (type == 3) {
-                    //星期日是0
-                    str.append(i).append(",");
+                    if (i == 0){
+                        //星期日是0
+                        str.append(7).append(",");
+                    }else {
+                        str.append(i).append(",");
+                    }
+
                 } else {
                     str.append(i + 1).append(",");
                 }