fix:绍兴站无人机点位修改

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

@@ -1115,7 +1115,7 @@ public class PatrolResultController extends BaseController {
                         PatrolTask patrolTask = new PatrolTask();
                         patrolTask.setTaskCode(patrolTaskStatusItem.getTaskCode());
                         List<PatrolTask> patrolTaskListOfDb = patrolTaskService.selectPatrolTaskList(patrolTask);
-                        if (CollectionUtils.isEmpty(patrolTaskListOfDb)) {
+                        if (StringUtils.isEmpty(patrolTaskStatusItem.getTaskCode()) || CollectionUtils.isEmpty(patrolTaskListOfDb)) {
                             logger.info("TASK CODE: {} NO EXIST, SKIP IT!", patrolTaskStatusItem.getTaskCode());
                         } else {
                             try {
@@ -1396,7 +1396,7 @@ public class PatrolResultController extends BaseController {
                     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());
                         }
@@ -1418,6 +1418,14 @@ 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);
                     List<PatrolResult> results = patrolResultService.selectPatrolResultList(patrolResultParam);