From 89b7060ca2d4b67473a2138f805f70724d244369 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Thu, 23 Oct 2025 15:13:03 +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=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=B7=A1=E8=A7=86=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PatrolResultServiceImpl.java |  2 +-
 .../resources/mapper/PatrolResultMapper.xml   | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

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 3a2ba44..7faaa19 100644
--- a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java
+++ b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java
@@ -393,7 +393,7 @@ public class PatrolResultServiceImpl implements PatrolResultService {
         }
         if (StringUtils.isEmpty(patrolResultParam.getEndTime()) && StringUtils.isEmpty(patrolResultParam.getStartTime())) {
             List<PatrolResult> finalPatrolResults = patrolResults;
-            patrolResults = patrolResults.stream().filter(item -> finalPatrolResults.get(0).getTaskPatrolledId().equals(item.getTaskPatrolledId())).collect(Collectors.toList());
+            patrolResults = patrolResults.parallelStream().filter(item -> finalPatrolResults.get(0).getTaskPatrolledId().equals(item.getTaskPatrolledId())).collect(Collectors.toList());
         }
         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 2480c71..84a115f 100644
--- a/src/main/resources/mapper/PatrolResultMapper.xml
+++ b/src/main/resources/mapper/PatrolResultMapper.xml
@@ -793,6 +793,49 @@
     </select>
 
     <select id="selectPatrolResults" resultType="com.inspect.simulator.domain.result.PatrolResult">
+        select f.line_id lineId,
+        s.task_patrolled_id taskPatrolledId,
+        s.start_time startTime,
+        d.area_name areaName,
+        c.device_name deviceName,
+        c.phy_asset_id phyAssetId,
+        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,
+        ra.result_type resultType,
+        ra.filter filter,
+        ra.res_value resValue
+        from patrol_task_status s
+        left join result_analysis ra on ra.task_patrol_id = s.task_patrolled_id
+        left join patrol_result f on ra.business_id = f.line_id and ra.objectId = f.device_id
+        left join basedata_patrolpoint a on ra.objectId = a.patrol_point_id
+        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 != ''">
+            and c.phy_asset_id = #{astId}
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and c.device_type_name like concat('%',#{deviceType},'%')
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and s.start_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and s.start_time &lt;= #{endTime}
+        </if>
+        order by s.task_patrolled_id desc
+    </select>
+
+    <select id="selectPatrolResultOld" resultType="com.inspect.simulator.domain.result.PatrolResult">
         select f.line_id                lineId,
                s.task_patrolled_id      taskPatrolledId,
                s.start_time             startTime,