From e66145aa67bb3d33e4cce27cb8ffb909aec1de15 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Thu, 16 Apr 2026 10:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=B8=80=E8=A7=88=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2=E5=85=88=E6=8E=92=E9=99=A4F10?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mappers/ex/DeviceInfoMapperExt.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 fecb5d6..a5771f0 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,7 +315,7 @@ PARTITION BY device_id ORDER BY receive_ts DESC ) AS rn - FROM alert_history + 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 @@ -334,6 +334,7 @@ and device_info.flag = 0 and basic_monitoring_asset.flag != 1 and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 + and alert_history.source_type = 1 @@ -375,7 +376,7 @@ PARTITION BY device_id ORDER BY receive_ts DESC ) AS rn - FROM alert_history + 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 @@ -396,6 +397,7 @@ and device_info.flag = 0 and basic_monitoring_asset.flag != 1 and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 and ddgr.device_group_id = #{deviceGroupId} + and alert_history.source_type = 1