|
@@ -1907,11 +1907,12 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
|
|
|
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> jqrStorgeList = storgeService.list(Wraps.<Storge>lbQ().isNotNull(Storge::getCampId)
|
|
|
+ .eq(Storge::getLockStatus,"0")
|
|
|
+ .eq(Storge::getPointId,"124"));
|
|
|
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");
|
|
|
}
|
|
|
|