Pārlūkot izejas kodu

fix: 增加关机机器人命令执行操作,

wang.sq@aliyun.com 3 mēneši atpakaļ
vecāks
revīzija
9f26a7a63f

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

@@ -634,8 +634,8 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
         if(isFetched) {
             //todo wang.sq三坐标调用地址释放, $需要换地址$
             // 查询三坐标是否允许取
-            //String fetchStatus = msgUtil.getCcsData("/api/GetMiddleThreeCoordinates", params, taskNode);
-            String fetchStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线:192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
+            String fetchStatus = msgUtil.getCcsData("/api/GetMiddleThreeCoordinates", params, taskNode);
+            //String fetchStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线:192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
 
             JSONObject fetchObject = JSONObject.parseObject(fetchStatus);
             logger.warn("三坐标节点{}取查询接口返回{}", taskNode.getId(), fetchObject.toJSONString());
@@ -657,8 +657,8 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
             //三坐标中间放操作
             // 查询三坐标是否允许放
             //todo wang.sq三坐标调用地址释放$需要换地址$
-            //String sendStatus = msgUtil.getCcsData("/api/QueryThreeCoordinatesFreePos", params, taskNode);
-            String sendStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线:192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
+            String sendStatus = msgUtil.getCcsData("/api/QueryThreeCoordinatesFreePos", params, taskNode);
+            //String sendStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线:192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
 
             JSONObject sendObject = JSONObject.parseObject(sendStatus);
             logger.warn("三坐标节点{}放查询接口返回{}", taskNode.getId(), sendObject.toJSONString());

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

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

+ 1 - 1
imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/ToolbarController.java

@@ -149,7 +149,7 @@ public class ToolbarController {
 
         if(start.length()!=10 || goal.length()!=10)return R.fail("参数长度不为10");
 
-        String instructionUrl = "/api/GetCallbackList";
+        String instructionUrl = "/api/RobotAction";
 
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("taskId",  "1");