|
|
|
@ -520,10 +520,7 @@ public class PatrolTaskStatusController extends BaseController { |
|
|
|
return AjaxResult.error(501, "THERE TASK IS RUNNING!"); |
|
|
|
} else { |
|
|
|
PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId()); |
|
|
|
Boolean result = issueToRobot(patrol);//type=41 立即执行任务 |
|
|
|
if (!result) { |
|
|
|
sendTaskToVideo(patrol); |
|
|
|
} |
|
|
|
issueToRobot(patrol);//type=41 立即执行任务 |
|
|
|
return toAjax(1); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -568,8 +565,7 @@ public class PatrolTaskStatusController extends BaseController { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public Boolean issueToRobot(PatrolTask patrolTask) { |
|
|
|
Boolean result = false; |
|
|
|
public void issueToRobot(PatrolTask patrolTask) { |
|
|
|
String receiveCode = ""; |
|
|
|
String sendCode = ""; |
|
|
|
BasedataEqpBookMoMain basedataEqpBookMoMain = new BasedataEqpBookMoMain(); |
|
|
|
@ -597,7 +593,8 @@ public class PatrolTaskStatusController extends BaseController { |
|
|
|
sendTask.setCommand("1"); |
|
|
|
String str = JSONObject.toJSONString(sendTask); |
|
|
|
this.feignTaskClient.sendCommand(str); |
|
|
|
result = true; |
|
|
|
} else { |
|
|
|
sendTaskToVideo(patrolTask); |
|
|
|
} |
|
|
|
// |
|
|
|
// SendTask sendTaskcontrol = new SendTask(); |
|
|
|
@ -615,7 +612,6 @@ public class PatrolTaskStatusController extends BaseController { |
|
|
|
// this.feignTaskClient.sendCommand(jsonString); |
|
|
|
} |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping({"/taskStatusChange"}) |
|
|
|
|