ccs新版对接调整

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

@@ -526,8 +526,8 @@ public class TaskWorkNode {
 
         JSONObject jsonObject = new JSONObject();
         //jsonObject.put("businessType", taskNode.getAutoNodeCode());
-        jsonObject.put("taskId", taskNode.getTaskId());
-        jsonObject.put("taskNodeId", taskNode.getId());
+        jsonObject.put("taskId", String.valueOf(taskNode.getTaskId()));
+        jsonObject.put("taskNodeId", String.valueOf(taskNode.getId()));
 //        jsonObject.put("bizType", bizType);
         //jsonObject.put("uid", taskNode.getCreateUser() + "");
         jsonObject.put("url", conMap.get("url"));

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

@@ -294,7 +294,8 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     //String fileNames[] = fileName.split(",");
                     JSONObject data = new JSONObject();
                     data.put("remotePath", procedureProgramList.get(0).getSubmittedFileName());
-                    map.put("data", data);
+//                    map.put("data", data);
+                    map.remove("data");
                     map.put("method", "StartNCProgram");
                     map.put("result", true);
                 }
@@ -335,7 +336,8 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     map.put("url",plcInfo.get("url"));
                     map.put("port",plcInfo.get("port"));
                     map.put("result", true);
-                    map.put("data", new HashMap<>());
+                    map.remove("data");
+//                    map.put("data", new HashMap<>());
                 }
                 break;
             case "三坐标检测仪":