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