From 2a58fe5604c18311c7769e35deb1b132a7523a7b Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Tue, 11 Mar 2025 17:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AB=8B=E5=8D=B3=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolTaskStatusController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 2d99bae..ca58930 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,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 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 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);