From 58634bb141b612868f40c47aed2ceed9287380a0 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Mon, 25 Aug 2025 11:52:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=8D=E5=85=B4=E7=AB=99=E6=97=A0?=
 =?UTF-8?q?=E4=BA=BA=E6=9C=BA=E7=82=B9=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PatrolResultController.java           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
index ba718fe..8547923 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
+++ b/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);