解决生成巡视报告不显示区域,设备,点位

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;

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();

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,