From 8974d3c4b3e62ad19409308073ec17d1fe5c47a1 Mon Sep 17 00:00:00 2001
From: lijw <lijw@123.com>
Date: Mon, 17 Mar 2025 13:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=9F=E6=88=90=E5=B7=A1?=
 =?UTF-8?q?=E8=A7=86=E6=8A=A5=E5=91=8A=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F,=E8=AE=BE=E5=A4=87,=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/inspect/partrolresult/domain/BasePointAreaInfo.java   | 1 +
 .../partrolresult/service/impl/PatrolResultServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/task/PatrolResultMapper.xml     | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/BasePointAreaInfo.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/BasePointAreaInfo.java
index fe0328c..45bd013 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/BasePointAreaInfo.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/BasePointAreaInfo.java
@@ -8,6 +8,7 @@ import java.util.Objects;
 @Setter
 @Getter
 public class BasePointAreaInfo {
+    private String deviceId;
     private String patrolPointId;
     private String patrolPointName;
     private String deviceName;
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
index 20a87df..cd465be 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
@@ -390,7 +390,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
             String devType = patrolResultRef.getDevType();
             BasePointAreaInfo basePointAreaInfo;
             try {
-                basePointAreaInfo = basePointAreaInfoList.stream().filter((item) -> item != null && patrolResultRef.getDeviceId().equals(item.getPatrolPointId())).findFirst().get();
+                basePointAreaInfo = basePointAreaInfoList.stream().filter((item) -> item != null && patrolResultRef.getDeviceId().equals(item.getDeviceId())).findFirst().get();
             } catch (Exception e) {
                 log.error("[REPORT DETAIL] The point lacking belonging area: {}", patrolResultRef.getDeviceId());
                 basePointAreaInfo = new BasePointAreaInfo();
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
index 71bbaae..595f014 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
@@ -463,6 +463,7 @@
     </select>
 
     <resultMap type="BasePointAreaInfo" id="BasePointAreaInfo">
+        <result property="deviceId" column="device_id"/>
         <result property="patrolPointId" column="patrol_point_id"/>
         <result property="patrolPointName" column="patrol_point_name"/>
         <result property="deviceName" column="device_name"/>
@@ -471,7 +472,8 @@
         <result property="areaName" column="area_name"/>
     </resultMap>
     <select id="selectBaseInfoByMainId" parameterType="String" resultMap="BasePointAreaInfo">
-        select a.patrol_point_id,
+        select f.device_id,
+               a.patrol_point_id,
                a.patrol_point_name,
                b.device_name,
                c.device_name as main_name,