Merge remote-tracking branch 'origin/master' into master

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

@@ -336,7 +336,7 @@ public class TaskWorkNode {
         //jsonObject.put("businessType", taskNode.getAutoNodeCode());
         jsonObject.put("taskId", taskNode.getTaskId());
         jsonObject.put("taskNodeId", taskNode.getId());
-        jsonObject.put("bizType", bizType);
+//        jsonObject.put("bizType", bizType);
         //jsonObject.put("uid", taskNode.getCreateUser() + "");
         jsonObject.put("url",  conMap.get("ip"));
         jsonObject.put("port", conMap.get("port"));
@@ -359,10 +359,13 @@ public class TaskWorkNode {
         bizJsonObject.put("srcPosition",  fstorge==null?"":fstorge.getId().toString());
         bizJsonObject.put("targetPostion",tstorge==null?"":tstorge.getId().toString());
         bizJsonObject.put("aimStorge",aimStorge==null?"":aimStorge.getId().toString());
+        bizJsonObject.put("bizType", bizType);
 
         //放入到线边库
         String xbkFlag = conMap.get(DemoLineConstant.DEMOLINE_XBKFLAG) == null ? "" : conMap.get(DemoLineConstant.DEMOLINE_XBKFLAG).toString();
-        bizJsonObject.put(DemoLineConstant.DEMOLINE_XBKFLAG, xbkFlag);
+        if(StringUtil.isNotEmpty(xbkFlag)){
+            bizJsonObject.put(DemoLineConstant.DEMOLINE_XBKFLAG, xbkFlag);
+        }
 
         //业务回调数据,传给接口，接口再返回过来。接口不让传多余参数，只能从缓存传
 //        jsonObject.put("bizCallBackData", bizJsonObject.toJSONString());

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

@@ -1254,7 +1254,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         } else {//取前面
             List<TaskNode> taskNodeList = baseMapper.selectList(Wraps.<TaskNode>lbQ().eq(TaskNode::getCompleteBatchNo, taskNode.getCompleteBatchNo()).orderByAsc(TaskNode::getCompleteBatchSort).lt(TaskNode::getCompleteBatchSort, taskNode.getCompleteBatchSort()));
             if (CollectionUtil.isNotEmpty(taskNodeList)) {
-                nextTaskNode = taskNodeList.get(n - 1);
+                nextTaskNode = taskNodeList.get(-n - 1);
             }
         }
         taskNode.setNextNode(nextTaskNode);

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

@@ -545,7 +545,6 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     }
                 }
             }else if (BizConstant.ROBOT_TYPE_NOCACHE.equals(zoneService.getRobotTypebyZone(zoneName))) {
-                dataMap.put("zkIp",ZK_ip_zndy);
                 dataMap.put("method", "SendServoStacker");
                 dataMap.put("toStorge", targetStorge);