修改bug

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/DemoLine/YunjianConstant.java

@@ -180,7 +180,7 @@ public interface YunjianConstant {
 
 
     //示范线传参常量-----线边库作为MQ的情形
-    String DEMOLINE_XBKFLAG ="DEMOLINE_XBKFLAG";
+    String YUNJIAN_XBKFLAG ="YUNJIAN_XBKFLAG";
 
     //示范线传参常量
     String DEMOLINE_XBK_TYPE ="DEMOLINE_XBK_TYPE";

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -649,8 +649,9 @@ public class TaskWorkNode {
 
         // 先判断上一指令是否为是否为设备指令，在判断工序最后一个指令是agv动作时锁定锁定agv接驳位
 
-        //前序是设备序并且最后一个节点是agv搬运，锁定agv相关库位信息
 
+        dataMap.put(YunjianConstant.YUNJIAN_XBKFLAG, YunjianConstant.YUNJIAN_XBKFLAG);
+        //前序是设备序并且最后一个节点是agv搬运，锁定agv相关库位信息
         if (BizConstant.ROBOT_TYPE_CACHE.equals(zoneService.getRobotTypebyZone(zone.getName()))) {//有缓存位的机器人
             //执行到第几步
             dataMap.put(taskNode.getId().toString() + "count", count);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/RobotNodeServiceImpl.java

@@ -457,8 +457,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put("fromStorge", handStorge);
                     String targetxbk =(String)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_XBK_FLAG + taskNode.getId());
                     if("1".equals(targetxbk)){
-                        dataMap.put(YunjianConstant.DEMOLINE_XBKFLAG, YunjianConstant.DEMOLINE_XBKFLAG);
-                        dataMap.put(YunjianConstant.DEMOLINE_XBKFLAG, YunjianConstant.DEMOLINE_XBKFLAG);
+                        dataMap.put(YunjianConstant.YUNJIAN_XBKFLAG, YunjianConstant.YUNJIAN_XBKFLAG);
                     }
                 }
             }else if (BizConstant.ROBOT_TYPE_NOCACHE.equals(zoneService.getRobotTypebyZone(zoneName))) {
@@ -479,8 +478,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 }
                 String targetxbk =(String)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_XBK_FLAG + taskNode.getId());
                 if("1".equals(targetxbk)){
-                    dataMap.put(YunjianConstant.DEMOLINE_XBKFLAG, YunjianConstant.DEMOLINE_XBKFLAG);
-                    dataMap.put(YunjianConstant.DEMOLINE_XBKFLAG, YunjianConstant.DEMOLINE_XBKFLAG);
+                    dataMap.put(YunjianConstant.YUNJIAN_XBKFLAG, YunjianConstant.YUNJIAN_XBKFLAG);
                 }
             }
             dataMap.put("result", true);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/MsgUtil.java

@@ -190,7 +190,7 @@ public class MsgUtil implements ApplicationContextAware {
 
 
             jsonObject.put("taskNodeId",nextTaskNode.getId().toString());
-            if(callBackJson.containsKey(DemoLineConstant.DEMOLINE_XBKFLAG)){//临时存放到了线边库，向虚拟线边库发一个MQ。
+            if(callBackJson.containsKey(YunjianConstant.YUNJIAN_XBKFLAG)){//临时存放到了线边库，向虚拟线边库发一个MQ。
                 if(callBackJson.containsKey(YunjianConstant.YUNJIAN_ROBORT_CACHE_FLAG)){//带缓存位机器人的多步骤执行
                     int count =  callBackJson.getString(taskNode.getId().toString()+"count")==null?0:Integer.parseInt(callBackJson.getString(taskNode.getId().toString()+"count"));
                     int limit =5;
@@ -199,14 +199,13 @@ public class MsgUtil implements ApplicationContextAware {
                         jsonObject.put(taskNode.getId().toString()+"count",count);
                         //把当前节点推送到mq
                         jsonObject.put("taskNodeId",taskNode.getId().toString());
-                        jsonObject.put(YunjianConstant.DEMOLINE_XBKFLAG,YunjianConstant.DEMOLINE_XBKFLAG);
+                        jsonObject.put("bizType",BizConstant.MQ_TASK_NODE_TYPE_XBK);
                         dynamicRabbitMq.sendMsg(taskNode.getResourceId().toString(),jsonObject.toString());
                         return;
                     }
                 }
                 dynamicRabbitMq.sendMsg(nextTaskNode.getResourceId().toString(),jsonObject.toString());
-            }
-            else{
+            }else{
                 jsonObject.put("bizType", BizConstant.MQ_TASK_NODE_TYPE_COMMON);
                 if(callBackJson.containsKey(YunjianConstant.YUNJIAN_ROBORT_CACHE_FLAG)){//带缓存位机器人的多步骤执行
                     int count =  callBackJson.getString(taskNode.getId().toString()+"count")==null?0:Integer.parseInt(callBackJson.getString(taskNode.getId().toString()+"count"));