From 8d609c62dcab7b91b800d4b37f27e0836cccf0da Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Mon, 3 Nov 2025 18:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8D=A2=E6=B5=81=E5=8F=98?=
 =?UTF-8?q?=E5=B0=8F=E6=A8=A1=E5=9E=8B=E6=8E=A5=E5=8F=A3=EF=BC=9A=E6=94=B9?=
 =?UTF-8?q?=E5=86=99=E8=8E=B7=E5=8F=96=E7=AE=97=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/inspect/simulator/mapper/PatrolResultMapper.java  | 2 ++
 .../simulator/service/impl/PatrolResultServiceImpl.java   | 6 ++++++
 src/main/resources/mapper/PatrolResultMapper.xml          | 8 +++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java b/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java
index 2d5391d..5c9ff27 100644
--- a/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java
+++ b/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java
@@ -97,4 +97,6 @@ public interface PatrolResultMapper {
     List<PatrolResult> selectPatrolResults(PatrolResultParam patrolResultParam);
 
     String selectPatrolResultByTaskPatrolledId(@Param("taskPatrolledId") String taskPatrolledId,@Param("objectId") String objectId);
+
+    List<Map<String, String>> selectAlgSubTypeByCode();
 }
diff --git a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java
index 7faaa19..99e7d80 100644
--- a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java
+++ b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java
@@ -395,6 +395,12 @@ public class PatrolResultServiceImpl implements PatrolResultService {
             List<PatrolResult> finalPatrolResults = patrolResults;
             patrolResults = patrolResults.parallelStream().filter(item -> finalPatrolResults.get(0).getTaskPatrolledId().equals(item.getTaskPatrolledId())).collect(Collectors.toList());
         }
+        List<Map<String, String>> maps = patrolResultMapper.selectAlgSubTypeByCode();
+
+        Map<String, String> algMap = maps.parallelStream().collect(Collectors.toMap(map -> map.get("alg_subtype_code"), map -> map.get("alg_subtype_name"), (oldValue, newValue) -> newValue));
+        patrolResults.parallelStream().forEach(item -> {
+            item.setAlgorithmsName(algMap.getOrDefault(item.getAlgorithmsType(),""));
+        });
         MessageBody messageBody = prepareMessageBodyToGetPatrolResults(patrolResults, patrolResultParam.getIsBase64());
         return messageBody;
     }
diff --git a/src/main/resources/mapper/PatrolResultMapper.xml b/src/main/resources/mapper/PatrolResultMapper.xml
index 84a115f..6091dfa 100644
--- a/src/main/resources/mapper/PatrolResultMapper.xml
+++ b/src/main/resources/mapper/PatrolResultMapper.xml
@@ -792,6 +792,11 @@
           and f.check_time is null and a.patrol_point_id is not null
     </select>
 
+    <select id="selectAlgSubTypeByCode" resultType="java.util.Map">
+        select a.*
+        from basedata_alg_subtype a
+    </select>
+
     <select id="selectPatrolResults" resultType="com.inspect.simulator.domain.result.PatrolResult">
         select f.line_id lineId,
         s.task_patrolled_id taskPatrolledId,
@@ -802,7 +807,6 @@
         a.patrol_point_name pointName,
         f.create_time createTime,
         f.file_path filePath,
-        bas.alg_subtype_name algorithmsName,
         ra.alg_type algorithmsType,
         ra.res_img_url resImgUrl,
         ra.image_normal_url_path imageNormalUrlPath,
@@ -816,8 +820,6 @@
         left join basedata_device c on a.device_id = c.device_id
         left join basedata_area e on a.area_id = e.area_id
         left join basedata_area d on d.area_id = e.parent_id
-        left join basedata_alg_subtype bas
-        on bas.alg_subtype_code = ra.alg_type and find_in_set(bas.alg_subtype_id, a.alg_subtype_ids)
         where
         a.patrol_point_id is not null and (ra.filter = '0' or ra.filter = '1')
         <if test="astId != null and astId != ''">