绍兴站无人机机器狗点位id问题修改

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1134,12 +1134,14 @@ public class PatrolResultController extends BaseController {
                                 } else if (StringUtils.isNotEmpty(sendCode)) {
                                     str = sendCodeToDevType(sendCode);
                                     patrolTaskStatus.setPosType(str);
+                                    // 鲁人机器人
                                     if ("1".equals(str) && "E100-001".equals(sendCode)) {
                                         List<BasedataEqpBookChannel> listEqpBook = baseDataClient.queryEqpBookCode(sendCode);
                                         patrolTaskStatusItem.setCode(listEqpBook.get(0).getChannelCode());
                                     }
                                 }
                                 List<PatrolTaskStatus> patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
+                                // 任务状态完成，终止，超过期限
                                 if (patrolTaskStatusItem.getTaskState() != null &&
                                         (patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode())
                                                 || patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode())
@@ -1376,9 +1378,10 @@ public class PatrolResultController extends BaseController {
                     patrolResultParam.setTaskPatrolledId(patrolResult.getTaskPatrolledId());
                     str = parseObject.getString("SendCode");
                     String strfile;
+                    // 机器狗
                     if ("2".equals(datetype)) {
                         logger.info("feedback from robot");
-                        Long patrolPointId = baseDataClient.queryPatrolPointId(str + "_" + patrolResult.getDeviceId());
+                        Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId());
                         if (patrolPointId != null) {
                             patrolResult.setDeviceId(patrolPointId.toString());
                         }
@@ -1399,6 +1402,13 @@ public class PatrolResultController extends BaseController {
                             }
                         }
                     }
+                    // 无人机点位id处理
+                    if ("3".equals(datetype)) {
+                        Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId());
+                        if (patrolPointId != null) {
+                            patrolResult.setDeviceId(patrolPointId.toString());
+                        }
+                    }
 
                     patrolResultParam.setDeviceId(patrolResult.getDeviceId());
                     patrolResultParam.setDataType(datetype);