From b349e021cee680ba792ce026ba7a3d6b8529f827 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Thu, 3 Apr 2025 17:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=BC=94=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 88 ++++++++++++------- .../service/IPatrolTaskInfoService.java | 2 +- .../impl/PatrolTaskInfoServiceImpl.java | 16 ++-- 3 files changed, 69 insertions(+), 37 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index ee19bb9..48e7e99 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -737,22 +737,26 @@ public class PatrolTaskController extends BaseController { patrolSendTask.setDeviceList("[empty device list 1]"); } } else { - List infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId())); - logger.info("[TASK] taskId: {}", patrolTask.getTaskId()); + Map map = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId())); + List infoList = map.get("list"); + List infoListFull = map.get("listFull"); + logger.info("[TASK] taskId1: {}, infoList1: {}, infoListFull1: {}", patrolTask.getTaskId(), infoList, infoListFull); if (!infoList.isEmpty()) { if(receiveCode.startsWith("areaPatrolServer")) { List areaPatrolDevList = new ArrayList(); - for (String dev : infoList) { + for (int i = 0; i < infoListFull.size(); i++) { + String dev = infoListFull.get(i); if(dev.startsWith("areaPatrolServer")) { - areaPatrolDevList.add(dev); + areaPatrolDevList.add(infoList.get(i)); } } patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, areaPatrolDevList)); } else { List otherDevList = new ArrayList(); - for (String dev : infoList) { + for (int i = 0; i < infoListFull.size(); i++) { + String dev = infoListFull.get(i); if(!dev.startsWith("areaPatrolServer")) { - otherDevList.add(dev); + otherDevList.add(infoList.get(i)); } } patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, otherDevList)); @@ -881,16 +885,17 @@ public class PatrolTaskController extends BaseController { continue; } feignTaskClient.sendCommand(str); - if (receiveCode.startsWith("Client05")) { - SendTask sendTaskClient = new SendTask(); - sendTaskClient.setSendCode(sendCode); - sendTaskClient.setCode(patrolTask.getTaskId() + ""); - sendTaskClient.setReceiveCode(receiveCode); - sendTaskClient.setCommand("1"); - sendTaskClient.setType("41"); - String s = JSONObject.toJSONString(sendTaskClient); - this.feignTaskClient.sendCommand(s); - } +// if (receiveCode.startsWith("Client05")) { +// // 无人机下发逻辑和机器狗，滤波器保持一致 +// SendTask sendTaskClient = new SendTask(); +// sendTaskClient.setSendCode(sendCode); +// sendTaskClient.setCode(patrolTask.getTaskId() + ""); +// sendTaskClient.setReceiveCode(receiveCode); +// sendTaskClient.setCommand("1"); +// sendTaskClient.setType("41"); +// String s = JSONObject.toJSONString(sendTaskClient); +// this.feignTaskClient.sendCommand(s); +// } } } else { BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); @@ -931,14 +936,35 @@ public class PatrolTaskController extends BaseController { if (StringUtils.isNotEmpty(patrolTask.getDeviceList())) { patrolSendTask.setDeviceList(patrolTask.getDeviceList()); } else { - patrolSendTask.setDeviceList(""); + patrolSendTask.setDeviceList("[empty device list 3]"); } } else { - List infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId())); + Map map = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId())); + List infoList = map.get("list"); + List infoListFull = map.get("listFull"); + logger.info("[TASK] taskId2: {}, infoList2: {}, infoListFull2: {}", patrolTask.getTaskId(), infoList, infoListFull); if (!infoList.isEmpty()) { - patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, infoList)); + if(receiveCode.startsWith("areaPatrolServer")) { + List areaPatrolDevList = new ArrayList(); + for (int i = 0; i < infoListFull.size(); i++) { + String dev = infoListFull.get(i); + if(dev.startsWith("areaPatrolServer")) { + areaPatrolDevList.add(infoList.get(i)); + } + } + patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, areaPatrolDevList)); + } else { + List otherDevList = new ArrayList(); + for (int i = 0; i < infoListFull.size(); i++) { + String dev = infoListFull.get(i); + if(!dev.startsWith("areaPatrolServer")) { + otherDevList.add(infoList.get(i)); + } + } + patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, otherDevList)); + } } else { - patrolSendTask.setDeviceList(""); + patrolSendTask.setDeviceList("[empty device list 4]"); } } @@ -1062,17 +1088,17 @@ public class PatrolTaskController extends BaseController { return; } feignTaskClient.sendCommand(str); - if (receiveCode.startsWith("Client05")) { - // 无人机下发逻辑和机器狗，滤波器保持一致 - SendTask sendTaskClient = new SendTask(); - sendTaskClient.setSendCode(sendCode); - sendTaskClient.setCode(patrolTask.getTaskId() + ""); - sendTaskClient.setReceiveCode(receiveCode); - sendTaskClient.setCommand("1"); - sendTaskClient.setType("41"); - String s = JSONObject.toJSONString(sendTaskClient); - this.feignTaskClient.sendCommand(s); - } +// if (receiveCode.startsWith("Client05")) { +// // 无人机下发逻辑和机器狗，滤波器保持一致 +// SendTask sendTaskClient = new SendTask(); +// sendTaskClient.setSendCode(sendCode); +// sendTaskClient.setCode(patrolTask.getTaskId() + ""); +// sendTaskClient.setReceiveCode(receiveCode); +// sendTaskClient.setCommand("1"); +// sendTaskClient.setType("41"); +// String s = JSONObject.toJSONString(sendTaskClient); +// this.feignTaskClient.sendCommand(s); +// } } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java index 38fbf19..c87a232 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java @@ -17,7 +17,7 @@ public interface IPatrolTaskInfoService { List selectPatrolTaskInfoList(PatrolTaskInfo info); - List selectPatrolTaskInfoListByMajorId(String majorId); + Map selectPatrolTaskInfoListByMajorId(String majorId); List selectPatrolTask(PatrolTaskInfo patrolTaskInfo); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java index da18491..a6effd5 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.inspect.taskinfo.mapper.PatrolTaskInfoMapper; import com.inspect.taskinfo.service.IPatrolTaskInfoService; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,14 +45,19 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { return this.patrolTaskInfoMapper.selectPatrolTask(patrolTaskInfo); } - public List selectPatrolTaskInfoListByMajorId(String taskId) { + public Map selectPatrolTaskInfoListByMajorId(String taskId) { + Map map = new HashMap<>(); List list1 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorId(taskId); - List list2 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdFull(taskId); - if(list1.size() > 0 && list1.get(0).equals(list2.get(0))) { - return this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdEither(taskId); + List listFull = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdFull(taskId); + if(list1.size() > 0 && list1.get(0).equals(listFull.get(0))) { + List list2 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdEither(taskId); + map.put("list" , list2); + map.put("listFull", listFull); } else { - return list1; + map.put("list" , list1); + map.put("listFull", listFull); } + return map; } public List selectPatrolAbnormalTaskList(PatrolTaskInfo patrolTaskInfo) {