diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index 7ea7f40..218c25b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -520,8 +520,10 @@ public class PatrolTaskStatusController extends BaseController { return AjaxResult.error(501, "THERE TASK IS RUNNING!"); } else { PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId()); - issueToRobot(patrol); //type=41 立即执行任务 - sendTaskToVideo(patrol); + Boolean result = issueToRobot(patrol);//type=41 立即执行任务 + if (!result) { + sendTaskToVideo(patrol); + } return toAjax(1); } } @@ -566,7 +568,8 @@ public class PatrolTaskStatusController extends BaseController { } - public void issueToRobot(PatrolTask patrolTask) { + public Boolean issueToRobot(PatrolTask patrolTask) { + Boolean result = false; String receiveCode = ""; String sendCode = ""; BasedataEqpBookMoMain basedataEqpBookMoMain = new BasedataEqpBookMoMain(); @@ -585,6 +588,17 @@ public class PatrolTaskStatusController extends BaseController { if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) { receiveCode = eqpBookMoMains.get(0).getMainSystemCode(); } + if (StringUtils.isNotEmpty(receiveCode) && receiveCode.startsWith("areaPatrolServer")) { + SendTask sendTask = new SendTask(); + sendTask.setReceiveCode(receiveCode); + sendTask.setSendCode(sendCode); + sendTask.setCode(patrolTask.getTaskId() + ""); + sendTask.setType("41"); + sendTask.setCommand("1"); + String str = JSONObject.toJSONString(sendTask); + this.feignTaskClient.sendCommand(str); + result = true; + } // // SendTask sendTaskcontrol = new SendTask(); // sendTaskcontrol.setReceiveCode(receiveCode); @@ -599,18 +613,9 @@ public class PatrolTaskStatusController extends BaseController { // sendTaskcontrol.setItems(sendTaskArrayList); // String jsonString = JSONObject.toJSONString(sendTaskcontrol); // this.feignTaskClient.sendCommand(jsonString); - - SendTask sendTask = new SendTask(); - sendTask.setReceiveCode(receiveCode); - sendTask.setSendCode(sendCode); - sendTask.setCode(patrolTask.getTaskId() + ""); - sendTask.setType("41"); - sendTask.setCommand("1"); - String str = JSONObject.toJSONString(sendTask); - this.feignTaskClient.sendCommand(str); } } - + return result; } @GetMapping({"/taskStatusChange"})