From 92768d54215b231340ed6c4eaabbf936dda97964 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Fri, 31 Oct 2025 09:28:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=81=B5=E5=B7=9E=E7=AB=99=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=B6=8B=E5=8A=BF=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatrolStatisticsController.java           |  4 +-
 .../mapper/StatisticsPatrolResultMapper.java  |  1 +
 .../impl/PatrolStatisticsServiceImpl.java     |  5 +-
 .../resources/mapper/PatrolResultMapper.xml   | 51 +++++++++++++++++++
 4 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java
index 5ada95d..af577f5 100644
--- a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java
+++ b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/controller/PatrolStatisticsController.java
@@ -79,7 +79,7 @@ public class PatrolStatisticsController extends BaseController {
                 result.setRecognitionTypes(arrayList);
             } else {
                 List<String> arrayList = new ArrayList<>();
-                arrayList.add(result.getRecognitionType());
+                arrayList.add("1".equals(result.getRecognitionType()) ? AlgConstants.METER : result.getRecognitionType());
                 result.setRecognitionTypes(arrayList);
             }
         }
@@ -107,7 +107,7 @@ public class PatrolStatisticsController extends BaseController {
                 result.setRecognitionTypes(arrayList);
             } else {
                 List<String> arrayList = new ArrayList<>();
-                arrayList.add(result.getRecognitionType());
+                arrayList.add("1".equals(result.getRecognitionType()) ? AlgConstants.METER : result.getRecognitionType());
                 result.setRecognitionTypes(arrayList);
             }
         }
diff --git a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/mapper/StatisticsPatrolResultMapper.java b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/mapper/StatisticsPatrolResultMapper.java
index 9b1fc6b..b5e39fe 100644
--- a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/mapper/StatisticsPatrolResultMapper.java
+++ b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/mapper/StatisticsPatrolResultMapper.java
@@ -12,6 +12,7 @@ public interface StatisticsPatrolResultMapper {
     List<StatisticsPatrolResult> queryPatrolResult(StatisticsPatrolResult result);
 
     List<StatisticsPatrolResult> queryPatrolResultMulti(StatisticsPatrolResult result);
+    List<StatisticsPatrolResult> queryPatrolResultMulti2(StatisticsPatrolResult result);
 
     List<StatisticsPatrolResult> queryPatrolResultMultiExport(StatisticsPatrolResult result);
 
diff --git a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/service/impl/PatrolStatisticsServiceImpl.java b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/service/impl/PatrolStatisticsServiceImpl.java
index ba0c670..5ea9edd 100644
--- a/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/service/impl/PatrolStatisticsServiceImpl.java
+++ b/inspect-main/inspect-main-statistics/src/main/java/com/inspect/statistics/service/impl/PatrolStatisticsServiceImpl.java
@@ -43,7 +43,7 @@ public class PatrolStatisticsServiceImpl implements PatrolStatisticsService {
     }
 
     public List<StatisticsPatrolResult> queryPatrolResultMulti(StatisticsPatrolResult result) {
-        return this.resultMapper.queryPatrolResultMulti(result);
+        return this.resultMapper.queryPatrolResultMulti2(result);
     }
 
     public List<StatisticsPatrolResult> queryPatrolResultMultiExport(StatisticsPatrolResult result) {
@@ -56,7 +56,8 @@ public class PatrolStatisticsServiceImpl implements PatrolStatisticsService {
     }
 
     public JSONArray chartsMulti(StatisticsPatrolResult result) {
-        List<StatisticsPatrolResult> list = this.resultMapper.queryPatrolResultMulti(result);
+//        List<StatisticsPatrolResult> list = this.resultMapper.queryPatrolResultMulti(result);
+        List<StatisticsPatrolResult> list = this.resultMapper.queryPatrolResultMulti2(result);
         Map<String, List<StatisticsPatrolResult>> group = list.stream().collect(Collectors.groupingBy(StatisticsPatrolResult::getDeviceId));
         JSONArray jsonArray = new JSONArray();
 
diff --git a/inspect-main/inspect-main-statistics/src/main/resources/mapper/PatrolResultMapper.xml b/inspect-main/inspect-main-statistics/src/main/resources/mapper/PatrolResultMapper.xml
index 39692fe..ebc4400 100644
--- a/inspect-main/inspect-main-statistics/src/main/resources/mapper/PatrolResultMapper.xml
+++ b/inspect-main/inspect-main-statistics/src/main/resources/mapper/PatrolResultMapper.xml
@@ -104,6 +104,57 @@
         order by time asc
     </select>
 
+
+    <select id="queryPatrolResultMulti2"  resultMap="PatrolResult">
+        select
+            result.line_id,
+            result.patrol_device_name,
+            result.patrol_device_code,
+            result.task_name,
+            result.task_code,
+            result.device_name,
+            result.device_id,
+            result.value_type,
+            case when (analysis.res_value is null or analysis.res_value = '') then 0 else analysis.res_value end as value,
+            result.value_unit,
+            result.unit,
+            result.time,
+            analysis.alg_type as recognition_type,
+            result.file_type,
+            result.file_path,
+            result.rectangle,
+            result.task_patrolled_id,
+            result.valid,
+            result.patrol_status,
+            result.check_person,
+            result.check_time,
+            result.check_result,
+            result.material_id,
+            result.data_type,
+            result.threshold,
+            result.task_id,
+            result.main_id,
+            result.create_time,
+            point.device_id productionId,
+            point.purpose purpose
+        from basedata_patrolpoint point
+        left join result_analysis analysis on point.patrol_point_id  = analysis.objectId
+        left join patrol_result result on result.line_id = analysis.business_id and analysis.objectId = result.device_id and analysis.task_patrol_id = result.task_patrolled_id
+        <where>
+            analysis.filter = '0' and analysis.res_code = '2000' and analysis.result_type = '1'
+            <if test="deviceIds != null "> and find_in_set(point.device_id, #{deviceIds})</if>
+            <if test="recognitionTypes != null and recognitionTypes.size() > 0">
+                and analysis.alg_type in
+                <foreach collection="recognitionTypes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="startTime != null and endTime != null "> and analysis.create_time between #{startTime} and #{endTime}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+        </where>
+        order by analysis.create_time asc
+    </select>
+
     <select id="queryPatrolResultMultiExport"  resultMap="PatrolResult">
         <include refid="selectPatrolResultJoinExport"/>
         <where>