现场演示问题修改

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<String> infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId()));
-                    logger.info("[TASK] taskId: {}", patrolTask.getTaskId());
+                    Map<String, List> map = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId()));
+                    List<String> infoList = map.get("list");
+                    List<String> 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<String> infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId()));
+                Map<String, List> map = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId()));
+                List<String> infoList = map.get("list");
+                List<String> 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);
+//            }
         }
 
     }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java

@@ -17,7 +17,7 @@ public interface IPatrolTaskInfoService {
 
     List<PatrolTaskInfo> selectPatrolTaskInfoList(PatrolTaskInfo info);
 
-    List<String> selectPatrolTaskInfoListByMajorId(String majorId);
+    Map<String, List> selectPatrolTaskInfoListByMajorId(String majorId);
 
     List<PatrolTaskInfo> selectPatrolTask(PatrolTaskInfo patrolTaskInfo);
 

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<String> selectPatrolTaskInfoListByMajorId(String taskId) {
+    public Map<String, List> selectPatrolTaskInfoListByMajorId(String taskId) {
+        Map<String, List> map = new HashMap<>();
         List<String> list1 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorId(taskId);
-        List<String> list2 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdFull(taskId);
-        if(list1.size() > 0 && list1.get(0).equals(list2.get(0))) {
-            return this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdEither(taskId);
+        List<String> listFull = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdFull(taskId);
+        if(list1.size() > 0 && list1.get(0).equals(listFull.get(0))) {
+            List<String> 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<PatrolTaskInfo> selectPatrolAbnormalTaskList(PatrolTaskInfo patrolTaskInfo) {