From 420c1a7d1fd8af37077be86b448e159588b0e2f8 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Tue, 21 Apr 2026 15:22:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E7=9B=B8=E5=85=B3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8CF10=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/ex/DeviceInfoMapperExt.xml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
index 1268072..8f1793f 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
@@ -315,12 +315,12 @@
                     PARTITION BY device_id
                     ORDER BY receive_ts DESC
                     ) AS rn
-                    FROM alert_history
-                 ) alert_history on alert_history.device_id = device_info.device_id
+                    FROM alert_history where alert_history.source_type = 1
+                 ) alert_history on alert_history.device_id = device_info.device_id AND alert_history.rn = 1
             </when>
             <otherwise>
                 alert_history
-                left join device_info on alert_history.device_id = device_info.device_id
+                left join device_info on alert_history.device_id = device_info.device_id and alert_history.source_type = 1
             </otherwise>
         </choose>
         left join basic_monitoring_asset on device_info.asset_id = basic_monitoring_asset.equipment_id
@@ -375,12 +375,12 @@
                 PARTITION BY device_id
                 ORDER BY receive_ts DESC
                 ) AS rn
-                FROM alert_history
-                ) alert_history on alert_history.device_id = device_info.device_id
+                FROM alert_history where alert_history.source_type = 1
+                ) alert_history on alert_history.device_id = device_info.device_id AND alert_history.rn = 1
             </when>
             <otherwise>
                 alert_history
-                left join device_info on alert_history.device_id = device_info.device_id
+                left join device_info on alert_history.device_id = device_info.device_id and alert_history.source_type = 1
             </otherwise>
         </choose>
         left join basic_monitoring_asset on device_info.asset_id = basic_monitoring_asset.equipment_id