fix bug: order

web/src/main/java/com/zhehekeji/web/service/InitService.java

@@ -70,7 +70,7 @@ public class InitService implements ApplicationRunner {
                     log.error("初始相机 登录失败：cameraId{}",camera.getId());
                 }else {
                     CameraConnMap.conn(camera.getId(),lLong);
-                    log.debug("初始相机登录成功 cameraId:{},loginId:{}",camera.getId(),lLong.longValue());
+                    log.info("初始相机登录成功 cameraId:{},loginId:{}",camera.getId(),lLong.longValue());
                 }
             });
         }

web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java

@@ -91,7 +91,7 @@ public class MyProtocolDecoder extends FixedLengthFrameDecoder {
             }
         } else if (type.equals(ACTION)) {
             log.info("action code,{} plcId:{},orderInfo:{}", code, plcId, plcOrderInfo.toString());
-            if(!code.equals("C6") && !code.equals("C7")){
+            if(code.equals("C1") || code.equals("C2") || code.equals("C3") || code.equals("C4") || code.equals("C5")){
                 // C1-5 是执行动作，需要保存执行到第几步了
                 Integer times = OrderAction.put(plcOrderInfo.getOrderNum());
                 //执行动作

web/src/main/java/com/zhehekeji/web/service/OrderAction.java

@@ -1,6 +1,7 @@
 package com.zhehekeji.web.service;
 
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,6 +12,7 @@ import java.util.Map;
  * @Date  2021/1/20 13:54
  **/
 @Data
+@Slf4j
 public class OrderAction {
 
     private static Map<String,Integer> orderActions = new HashMap<>();
@@ -32,9 +34,11 @@ public class OrderAction {
             //该订单的任务达到4次了，不会再有任务了，清除缓存
             //具体看取货、放货、货物库内转移的流程
             if(times >= 4){
+                log.info("remove oderNum:{},times:{}",orderNum,times);
                 orderActions.remove(orderNum);
             }else {
                 orderActions.put(orderNum,times);
+                log.info("oderNum:{},times:{}",orderNum,times);
             }
             return times;
         }