Browse Source

任务立即下发修改

master
WangGuangYuan 9 months ago
parent
commit
2a58fe5604
1 changed files with 6 additions and 7 deletions
  1. +6
    -7
      inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

+ 6
- 7
inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java View File

@ -520,7 +520,6 @@ public class PatrolTaskStatusController extends BaseController {
return AjaxResult.error(501, "THERE TASK IS RUNNING!");
} else {
PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId());
patrolTaskController.issueTask(patrol); //type=101 下发任务
issueToRobot(patrol); //type=41 立即执行任务
// sendTaskToVideo(patrol);
return toAjax(1);
@ -580,12 +579,12 @@ public class PatrolTaskStatusController extends BaseController {
if (StringUtils.isNotEmpty(patrolTask.getDevNo())) {
String[] devNos = patrolTask.getDevNo().split(StringUtils.COMMA);
for (String devNo : devNos) {
// BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain();
// basedataEqpbookMomain.setPatrolDeviceCode(devNo);
// List<BasedataEqpBookMoMain> eqpBookMoMains = this.patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain);
// if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) {
// receiveCode = eqpBookMoMains.get(0).getMainSystemCode();
// }
BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain();
basedataEqpbookMomain.setPatrolDeviceCode(devNo);
List<BasedataEqpBookMoMain> eqpBookMoMains = this.patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain);
if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) {
receiveCode = eqpBookMoMains.get(0).getMainSystemCode();
}
//
// SendTask sendTaskcontrol = new SendTask();
// sendTaskcontrol.setReceiveCode(receiveCode);


Loading…
Cancel
Save