数据功能处理

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

@@ -617,8 +617,8 @@ public class TaskWorkNode {
 
                                                 //todo $需要换地址$
                                                 HttpEntity<String> formEntity = new HttpEntity<String>(jsonParam, headers);
-                                                //returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
-                                                returnData = "{\"result\": \"true\"}";
+                                                returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
+                                                //returnData = "{\"result\": \"true\"}";
 
                                             }
 

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

@@ -140,7 +140,7 @@ public class ToolRobotStrategy implements RobotStrategy {
         }
 
         //todo 与ccs联调需要释放  $需要换地址$
-        //bool = this.cutToolActionCondition("/api/getCutterDeviceIsTake", taskNode,pointId);
+        bool = this.cutToolActionCondition("/api/getCutterDeviceIsTake", taskNode,pointId);
 
         if(!bool){
             msgUtil.createWarnLog("刀具节点起始位取条件不满足","DataException");
@@ -259,7 +259,7 @@ public class ToolRobotStrategy implements RobotStrategy {
         }
 
         //todo 与ccs联调需要释放  $需要换地址$
-        //bool = this.cutToolActionCondition("/api/getCutterDeviceIsPut", taskNode,pointId);
+        bool = this.cutToolActionCondition("/api/getCutterDeviceIsPut", taskNode,pointId);
 
         if(!bool){
             msgUtil.createWarnLog("刀具节点目标位放置条件不满足","DataException");