From 5cc73d95932f335f5867dd67683797aaabd595c8 Mon Sep 17 00:00:00 2001
From: hsc <2189661656@qq.com>
Date: Wed, 5 Nov 2025 09:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E4=BA=BA=E6=9C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=82=B9=E4=BD=8D=E8=8E=B7=E5=8F=96=E7=BA=A2?=
 =?UTF-8?q?=E5=A4=96=E5=9B=BE=E7=89=87=E7=94=BB=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ResultAnalysisMapper.java          |  1 +
 .../impl/ResultAnnalysisServiceImpl.java      | 37 ++++++++++---------
 .../resources/mapper/ResultAnalysisMapper.xml |  5 +++
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/inspect/simulator/mapper/ResultAnalysisMapper.java b/src/main/java/com/inspect/simulator/mapper/ResultAnalysisMapper.java
index 7c09b4d..f247611 100644
--- a/src/main/java/com/inspect/simulator/mapper/ResultAnalysisMapper.java
+++ b/src/main/java/com/inspect/simulator/mapper/ResultAnalysisMapper.java
@@ -14,6 +14,7 @@ public interface ResultAnalysisMapper {
     String selectChannelImgByPatrolPointCode(String patrolPointId);
     String selectChannelImgByPatrolPointId(String patrolPointId);
     String selectImgByPatrolPointId(String patrolPointId);
+    String selectImg(String patrolPointId);
 
 
     int addDmtModelInfo(@Param("list") List<ContentJson> contentJsonList);
diff --git a/src/main/java/com/inspect/simulator/service/impl/ResultAnnalysisServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/ResultAnnalysisServiceImpl.java
index 42bec67..87f20ac 100644
--- a/src/main/java/com/inspect/simulator/service/impl/ResultAnnalysisServiceImpl.java
+++ b/src/main/java/com/inspect/simulator/service/impl/ResultAnnalysisServiceImpl.java
@@ -18,24 +18,25 @@ public class ResultAnnalysisServiceImpl implements ResultAnalysisService {
 
     @Override
     public String selectChannelImgByPatrolPointId(String patrolPointId) {
-        String resImageUrl=null;
-        String jsonStr=null;
-        String pointCode = resultAnalysisMapper.selectChannelImgByPatrolPointCode(patrolPointId);
-        int index = pointCode.indexOf("|");
-        String pointId = pointCode.substring(index + 1);
-        jsonStr = resultAnalysisMapper.selectChannelImgByPatrolPointId(pointId);
-        if (jsonStr==null){
-            jsonStr=resultAnalysisMapper.selectImgByPatrolPointId(patrolPointId);
-        }
-        resImageUrl = extractResImageUrl(jsonStr, patrolPointId);
-        if (resImageUrl==null){
-            try {
-                JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-                resImageUrl = jsonObject.getString("resImageUrl");
-            } catch (Exception e) {
-                e.getMessage();
-            }
-        }
+//        String resImageUrl=null;
+//        String jsonStr=null;
+//        String pointCode = resultAnalysisMapper.selectChannelImgByPatrolPointCode(patrolPointId);
+//        int index = pointCode.indexOf("|");
+//        String pointId = pointCode.substring(index + 1);
+//        jsonStr = resultAnalysisMapper.selectChannelImgByPatrolPointId(pointId);
+//        if (jsonStr==null){
+//            jsonStr=resultAnalysisMapper.selectImgByPatrolPointId(patrolPointId);
+//        }
+//        resImageUrl = extractResImageUrl(jsonStr, patrolPointId);
+//        if (resImageUrl==null){
+//            try {
+//                JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+//                resImageUrl = jsonObject.getString("resImageUrl");
+//            } catch (Exception e) {
+//                e.getMessage();
+//            }
+//        }
+        String resImageUrl = resultAnalysisMapper.selectImg(patrolPointId);
         return resImageUrl != null ? resImageUrl : "Image URL not found！！！";
     }
 
diff --git a/src/main/resources/mapper/ResultAnalysisMapper.xml b/src/main/resources/mapper/ResultAnalysisMapper.xml
index 1141ffb..021f610 100644
--- a/src/main/resources/mapper/ResultAnalysisMapper.xml
+++ b/src/main/resources/mapper/ResultAnalysisMapper.xml
@@ -30,6 +30,11 @@
             LIMIT 1;
     </select>
 
+    <select id="selectImg" parameterType="string" resultType="string">
+        select res_img_url from result_analysis
+        where objectId = #{patrolPointId}
+        order by line_id desc limit 1;
+    </select>
 
     <insert id="addDmtModelInfo" parameterType="java.util.List">
         INSERT INTO result_analysis