设备加工优先级优化

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

@@ -704,11 +704,8 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
         Object result = returnObj.get("result");
         Object work = returnObj.get("data");
 
-        result = "true";
-        work = "1";
-
         String point = null;
-        if(!Objects.isNull(result) && "true".equals(result) && !Objects.isNull(work)){
+        if(!Objects.isNull(result) && "true".equals(result.toString()) && !Objects.isNull(work)){
             point = DictionaryKey.HL_WORK_LOCATION.get(work.toString());
         }else{
             logger.warn("【恒轮调试空闲接口】条件不满足：result={},work={}",result,work);

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

@@ -592,8 +592,11 @@ public class TaskWorkNode {
             if(!(boolean)conMap.get("result")){
                 throw new InterruptedException("设备资源不通过，消息重新进入队尾");
             }else{
-                //优先级队列业务处理
-                updatePriorityList(priorityTaskNodeIdObj,taskNodeId);
+                Object xbkFlag = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_XBK_FLAG + taskNodeId);
+                if(Objects.isNull(xbkFlag) || !"1".equals(xbkFlag.toString())){ //线边库机制依然保存优先级
+                    //优先级队列业务处理
+                    updatePriorityList(priorityTaskNodeIdObj,taskNodeId);
+                }
             }
         }
     }

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

@@ -1906,6 +1906,15 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         logger.info("节点{}机器人类型{},机器人执行工步{},机器人执行第几步{}", taskNode.getId(), robotType, robotStepKey, robotStep);
         String xbkFlag = callBackJson.getString(YunjianConstant.YUNJIAN_XBKFLAG);
         logger.info("节点{}是否线边库逻辑{}", taskNode.getId(), xbkFlag);
+
+        List<Storge> jqrStorgeList = storgeService.list(Wraps.<Storge>lbQ().eq(Storge::getCampId,
+                taskNode.getId()));
+        List<Storge> jqrStorges = jqrStorgeList.stream().filter(x -> "124".equals(x.getPointId()) && !"124".equals(x.getName())).collect(Collectors.toList());
+        if(CollectionUtil.isNotEmpty(jqrStorges)){
+            //存在有机器人手抓锁定节点
+            msgUtil.redis_del("PRIORITY_PROCESSING");
+        }
+
         if (StringUtils.isNotBlank(xbkFlag)) {
             if (StringUtils.isBlank(robotStep)) {
                 // 放到线边库后释放资源

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/DictionaryKey.java

@@ -205,8 +205,8 @@ public interface DictionaryKey {
     Map<String, String> HL_WORK_LOCATION = new HashMap<String, String>(){
         {
             // 恒轮机床工作台点位对应关系
-            put("1", "127"); //工作台1
-            put("2", "128"); //工作台2
+            put("1", "128"); //工作台1
+            put("2", "127"); //工作台2
         }
     };