From a437d19ca204d9f4f66aa58c9261b56b30a99fb2 Mon Sep 17 00:00:00 2001
From: lijiuwei <lijiuwei@ht-atia.com>
Date: Fri, 18 Apr 2025 13:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E8=A7=86=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AnalysisServiceImpl.java     | 10 +++++-
 .../mapper/task/ResultAnalysisMapper.xml      | 32 +++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java
index ea89297..f6bc659 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java
@@ -146,7 +146,9 @@ public class AnalysisServiceImpl implements IAnalysisService {
         }
 
         List<AnalyseResItem> resContentList = analyseResult.getResultList();
+        Map<String, PatrolResult> resMap = selectObj2PatrolResultMap(analyseResult.getTaskPatrolId());
         log.info(Color.GREEN + "doAlgorithmAnalysis meter algorithm resContentList: {}" + Color.END, resContentList);
+        log.info(Color.GREEN + "doAlgorithmAnalysis meter algorithm resMap: {}" + Color.END, JSONObject.toJSONString(resMap));
         if (!resContentList.isEmpty()) {
             List<WebsocketData> websocketDataArrayList = new ArrayList<>();
             for (AnalyseResItem algorithmResult : resContentList) {
@@ -214,7 +216,13 @@ public class AnalysisServiceImpl implements IAnalysisService {
                     resultAnalysis.setResConf(algorithmInnerResult.getConf());
                     resultAnalysis.setResDesc(algorithmInnerResult.getDesc());
                     resultAnalysis.setResult(analyseResult.getResult());
-                    resultAnalysis.setResImgUrl(algorithmInnerResult.getResImageUrl());
+                    if (StringUtils.isEmpty(algorithmInnerResult.getResImageUrl())) {
+                        PatrolResult patrolResult = resMap.get(algorithmResult.getObjectId());
+                        log.info(Color.GREEN + "------------------------doAlgorithmAnalysis patrolResult: {}" + Color.END, JSONObject.toJSONString(patrolResult));
+                        resultAnalysis.setResImgUrl(patrolResult.getFilePath());
+                    } else {
+                        resultAnalysis.setResImgUrl(algorithmInnerResult.getResImageUrl());
+                    }
                     resultAnalysis.setImageNormalUrlPath(algorithmInnerResult.getImageNormalUrlPath());
                     resultAnalysis.setResPos(algorithmInnerResult.getPos() == null ? StringUtils.EMPTY : JSONObject.toJSONString(algorithmInnerResult.getPos()));
                     resultAnalysis.setFilter(analyseResult.getFilter());
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
index 434bffa..d7cff19 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
@@ -71,22 +71,34 @@
 
     <sql id="selectResultAnalysisVo">
         select line_id,
-               objectId,
-               description,
-               create_time,
-               request_id,
-               result_type,
-               point_status,
-               suggestion,
-               business_id,
-               res_status,
-               result_content
+            objectId,
+            description,
+            create_time,
+            request_id,
+            result_type,
+            point_status,
+            suggestion,
+            business_id,
+            res_status,
+            result_content,
+            res_value,
+            alg_type,
+            filter,
+            task_patrol_id,
+            res_code,
+            res_img_url,
+            res_conf,
+            res_desc,
+            res_pos,
+            result,
+            image_normal_url_path
         from result_analysis
     </sql>
 
     <select id="selectResultAnalysisList" parameterType="ResultAnalysis" resultMap="ResultAnalysisResult">
         <include refid="selectResultAnalysisVo"/>
         <where>
+            <if test="taskPatrolId != null  and taskPatrolId != ''">and task_patrol_id = #{taskPatrolId}</if>
             <if test="resultType != null  and resultType != ''">and result_type = #{resultType}</if>
             <if test="requestId != null  and requestId != ''">and request_id = #{requestId}</if>
             <if test="createTime != null  ">and create_time = #{createTime}</if>