灵州省侧点位模型同步,任务下发修改

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -2180,18 +2180,19 @@ public class PatrolTaskController extends BaseController {
         List<BasedataEqpBookMoMain> eqpBookMoMains = patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain);
         if (!eqpBookMoMains.isEmpty()) {
             Set<String> wrjCode = new HashSet<>();
-            List<BasedataEqpBookMoMain> bookMoMains = patrolResultService.selectBasedataEqpBookList(new BasedataEqpBookMoMain());
-            Iterator iterator = bookMoMains.iterator();
+            Iterator<BasedataEqpBookMoMain> iterator = eqpBookMoMains.iterator();
             while (true) {
                 String arr;
                 SendTask sendTaskcontrol;
+                String type;
+                String patrolDeviceCode;
                 do {
                     if (!iterator.hasNext()) {
                         if (!wrjCode.isEmpty()) {
-                            iterator = wrjCode.iterator();
+                            Iterator<String> iterator1 = wrjCode.iterator();
 
-                            while (iterator.hasNext()) {
-                                arr = (String) iterator.next();
+                            while (iterator1.hasNext()) {
+                                arr = iterator1.next();
                                 sendTaskcontrol = new SendTask();
                                 sendTaskcontrol.setReceiveCode(arr);
                                 sendTaskcontrol.setSendCode(sendCode);
@@ -2205,16 +2206,21 @@ public class PatrolTaskController extends BaseController {
 
                         return;
                     }
+                    basedataEqpbookMomain = iterator.next();
+                    arr = basedataEqpbookMomain.getMainSystemCode();
+                    type = basedataEqpbookMomain.getType();
+                    patrolDeviceCode = basedataEqpbookMomain.getPatrolDeviceCode();
 
-                    arr = (String) iterator.next();
-                } while (!arr.equals("1") && !arr.equals("2") && !arr.equals("3") && !arr.equals("13"));
+                } while (!type.equals("1") && !type.equals("2") && !type.equals("3") && !type.equals("13"));
 
                 if (StringUtils.isNotEmpty(arr)) {
+                    // 机器狗，无人机
+                    // 任务模式
                     wrjCode.add(arr);
                     sendTaskcontrol = new SendTask();
                     sendTaskcontrol.setReceiveCode(arr);
                     sendTaskcontrol.setSendCode(sendCode);
-                    sendTaskcontrol.setCode(arr);
+                    sendTaskcontrol.setCode(patrolDeviceCode);
                     sendTaskcontrol.setType("1");
                     sendTaskcontrol.setCommand("5");
                     List<PatrolSendTask> patrolSendTasks = new ArrayList<>();

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java

@@ -445,7 +445,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
                 BasedataPatrolPointPreset preset;
                 BasedataEqpBook eqpbook;
                 BasedataEqpBookChannel eqpbookChannel = null;
-                String type;
+                String type = "";
                 JSONObject jsonObject;
                 String presetCode;
                 do {
@@ -463,7 +463,9 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
                         eqpbookChannel = this.basedataEqpBookChannelMapper.selectBasedataEqpBookChannelByChannelId(channelId);
                     } while (null == eqpbookChannel);
                     eqpbook = this.basedataEqpbookMapper.selectBasedataEqpBookByEqpBookId(eqpbookChannel.getEqpBookId());
-
+                    if (null == eqpbook) {
+                        continue;
+                    }
                     type = eqpbook.getType();
                     if ("10".equals(type)) {
                         jsonObject = new JSONObject();
@@ -492,16 +494,18 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
                     }
                 } while (!"13".equals(type));
 
-                jsonObject = new JSONObject();
-                jsonObject.put("uav_code", eqpbookChannel.getUpSystemDeviceCode());
-                presetCode = preset.getPresetCode();
-                if (null != presetCode && !presetCode.isEmpty()) {
-                    jsonObject.put("uav_pos", presetCode);
-                } else {
-                    jsonObject.put("uav_pos", "1");
-                }
+                if ("13".equals(type)) {
+                    jsonObject = new JSONObject();
+                    jsonObject.put("uav_code", eqpbookChannel.getUpSystemDeviceCode());
+                    presetCode = preset.getPresetCode();
+                    if (null != presetCode && !presetCode.isEmpty()) {
+                        jsonObject.put("uav_pos", presetCode);
+                    } else {
+                        jsonObject.put("uav_pos", "1");
+                    }
 
-                jsonArray.add(jsonObject);
+                    jsonArray.add(jsonObject);
+                }
             }
         } else {
             return jsonArray;