From 79609ac1a9eea7d00985919145e969094028a01f Mon Sep 17 00:00:00 2001
From: WangGuangYuan <wgy_2020@163.com>
Date: Mon, 11 Aug 2025 11:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BD=92=E6=A1=A3=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E5=91=8A=E4=B8=AD=E6=9C=89=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=BA=E7=A9=BA=EF=BC=8C=E7=BA=A2=E5=A4=96=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E5=88=9D=E7=AD=9B=E7=BB=93=E6=9E=9C=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=88=90=E2=80=9C?=
 =?UTF-8?q?--=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/utils/ResultAnalysisUtils.java   |  5 +++-
 .../com/inspect/message/MessageUtils.java     |  2 ++
 .../mapper/task/PatrolResultMapper.xml        | 26 +++++++++----------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
index f04c15f..24cf8b8 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
@@ -149,6 +149,9 @@ public class ResultAnalysisUtils {
                 resultAnalysis.setResultType("0");
                 defaultDesc = device + messageUtils.get("告警");
             }
+            if (messageUtils.get("分析失败").equals(defaultDesc)) {
+                defaultDesc = "-";
+            }
         } else if (algType.equals("isolator")) {
             if (value.equals("3")) {
                 resultAnalysis.setPointStatus("1");
@@ -177,7 +180,7 @@ public class ResultAnalysisUtils {
                 resultAnalysis.setResultType("0");
                 resultAnalysis.setResStatus("0");
             }
-            if (StringUtils.isNotEmpty(defaultDesc) && defaultDesc.contains("分析失败")) {
+            if (StringUtils.isNotEmpty(defaultDesc) && defaultDesc.contains(messageUtils.get("分析失败"))) {
                 resultAnalysis.setResultType("2");
             }
         }
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java
index e74ad51..31339bc 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java
@@ -235,6 +235,8 @@ public class MessageUtils {
 					return "summary";
 				case "缺陷":
 					return "defect";
+				case"分析失败":
+					return "analysis failed";
 				default:
 			        return key;
 			}
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
index 5c0676b..dfc8dbf 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
@@ -687,20 +687,20 @@
         where f.main_id = #{mainId}
     </select>
     <select id="selectBaseInfoByMainIds" resultMap="BasePointAreaInfo">
-        select f.device_id,
-               a.patrol_point_id,
-               a.patrol_point_name,
-               b.device_name,
-               c.device_name as main_name,
-               d.area_name   as jg_name,
-               e.area_name
+        select
+            f.device_id,
+            a.patrol_point_id,
+            a.patrol_point_name,
+            b.device_name,
+            c.device_name as main_name,
+            d.area_name as jg_name,
+            e.area_name
         from patrol_result f
-                 left join basedata_patrolpoint a
-                           on f.device_id = a.patrol_point_id OR f.device_name = a.patrol_point_name
-                 left join basedata_device b on a.device_id = b.device_id and b.power_main_equ_flag = "no"
-                 left join basedata_device c on b.parent_id = c.device_id
-                 left join basedata_area d on c.area_id = d.area_id and d.area_type = 'bayunit'
-                 left join basedata_area e on c.area_id = e.area_id
+            left join basedata_patrolpoint a on f.device_id = a.patrol_point_id OR f.device_name = a.patrol_point_name
+            left join basedata_device b on a.device_id = b.device_id and b.power_main_equ_flag = "no"
+            left join basedata_device c on a.main_device_id = c.device_id
+            left join basedata_area d on a.area_id = d.area_id and d.area_type = 'bayunit'
+            left join basedata_area e on d.parent_id = e.area_id
         where f.main_id in
         <foreach collection="mainIds" item="item" index="index" open="(" separator="," close=")">
             #{item}