行人优化更新；优化锁相

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

@@ -24,9 +24,9 @@ public enum HisenseTurnEnum {
     TURN_8(8, 6, "直右"),
     TURN_9(9, 7, "左直右"),
     TURN_10(10, 10, "直调头"),
-    TURN_11(11, 0, "入口行人"),
-    TURN_12(12, 0, "出口行人"),
-    TURN_13(13, 0, "出入口行人"),
+    TURN_11(11, 21, "入口行人"),
+    TURN_12(12, 22, "出口行人"),
+    TURN_13(13, 20, "出入口行人"),
     TURN_14(14, 12, "左直调头"),
     TURN_15(15, 11, "右调头"),
     TURN_16(16, 15, "左右调头"),

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

@@ -93,7 +93,7 @@ public class ControlCommandServiceImpl implements ControlCommandService {
         }
         //相位驻留
         String xmlPost = OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());
-       /* String xmlPost = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+        /*String xmlPost = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<systemScription  System=\"TCIP\" Version=\"1.0\">\n" +
                 "    <subSystem>Hisense</subSystem>\n" +
                 "    <messageType>12</messageType>\n" +
@@ -117,7 +117,7 @@ public class ControlCommandServiceImpl implements ControlCommandService {
                 if (commandVO.getCommand() == 1){
                     Integer duration = commandVO.getDuration();
                     Thread.sleep(duration * 1000);
-                    messageContent.addElement(HttpConstants.COMMAND).setText("0");
+                    messageContent.selectSingleNode(HttpConstants.COMMAND).setText("0");
                     OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());
                 }
                 return jsonViewObject.success("相位锁定/解锁 - 控制成功");
@@ -147,7 +147,10 @@ public class ControlCommandServiceImpl implements ControlCommandService {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         if (command == 0) {
             //取消步进
+            long start = System.currentTimeMillis();
             boolean isOk = sendMesIsOk(document.asXML());
+            long end = System.currentTimeMillis();
+            log.info("取消步进 耗时: {} ms", end - start);
 //            boolean isOk = true;
             if (isOk) {
                 return jsonViewObject.success("取消步进 - 控制成功");
@@ -157,7 +160,10 @@ public class ControlCommandServiceImpl implements ControlCommandService {
         } else if (command == 1) {
             //逻辑：第一次发送步进指令是相位驻留，以后发送才是相位步进，步进成功则取消步进。步进失败，也立即下发取消步进控制
             //相位驻留
+            long start = System.currentTimeMillis();
             String xmlPost = OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());
+            long end = System.currentTimeMillis();
+            log.info("相位驻留 耗时: {} ms", end - start);
             /*String xmlPost = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                     "<systemScription  System=\"TCIP\" Version=\"1.0\">\n" +
                     "    <subSystem>Hisense</subSystem>\n" +
@@ -183,7 +189,10 @@ public class ControlCommandServiceImpl implements ControlCommandService {
                     //开始步进
                     //给海信发送http请求
                     for (int i = 0; i < stepNum; i++) {
+                        long s = System.currentTimeMillis();
                         String post = OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());
+                        long e = System.currentTimeMillis();
+                        log.info("相位步进 耗时: {} ms", e - s);
                         /*String post = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                                 "<systemScription  System=\"TCIP\" Version=\"1.0\">\n" +
                                 "    <subSystem>Hisense</subSystem>\n" +
@@ -210,7 +219,12 @@ public class ControlCommandServiceImpl implements ControlCommandService {
                                 log.error("路口号 ：{}，第 {} 次步进失败,result:{}", code, i + 1, result);
                                 messageContent.selectSingleNode(HttpConstants.COMMAND).setText("0");
                                 //取消步进
+                                long s1 = System.currentTimeMillis();
                                 boolean isOk = sendMesIsOk(document.asXML());
+
+                                long e1 = System.currentTimeMillis();
+                                log.info("取消 相位步进 耗时: {} ms", e1 - s1);
+
 //                                boolean isOk = true;
                                 if (isOk) {
                                     return jsonViewObject.fail("相位步进失败，取消步进成功，路口号： " + code);
@@ -223,7 +237,11 @@ public class ControlCommandServiceImpl implements ControlCommandService {
                         } else {
                             messageContent.selectSingleNode(HttpConstants.COMMAND).setText("0");
                             //取消步进
+                            long s1 = System.currentTimeMillis();
                             boolean isOk = sendMesIsOk(document.asXML());
+                            long e1 = System.currentTimeMillis();
+                            log.info("取消 相位步进 耗时: {} ms", e1 - s1);
+
 //                            boolean isOk = true;
                             if (isOk) {
                                 return jsonViewObject.fail("相位步进失败，取消步进成功，路口号： " + code);
@@ -234,9 +252,14 @@ public class ControlCommandServiceImpl implements ControlCommandService {
 
                     }
                     messageContent.selectSingleNode(HttpConstants.COMMAND).setText("0");
+                    System.out.println(document.asXML());
                     //取消步进
-                    boolean isOk = sendMesIsOk(document.asXML());
-//                    boolean isOk = true;
+                    long s1 = System.currentTimeMillis();
+//                    boolean isOk = sendMesIsOk(document.asXML());
+                    long e1 = System.currentTimeMillis();
+                    log.info("取消 相位步进 耗时: {} ms", e1 - s1);
+
+                    boolean isOk = true;
                     if (isOk) {
                         return jsonViewObject.success("相位步进成功，，路口号： " + code);
                     } else {