Browse Source

sql兼容回滚

bug
review512jwy@163.com 1 month ago
parent
commit
dc124c0412
  1. 10
      dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

10
dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

@ -315,8 +315,8 @@
PARTITION BY device_id
ORDER BY receive_ts DESC
) AS rn
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
FROM alert_history
) alert_history on alert_history.device_id = device_info.device_id
</when>
<otherwise>
alert_history
@ -334,7 +334,6 @@
<where>
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
<include refid="deviceDataCommonWhere"/>
<choose>
<when test="searchType == 1">
@ -376,8 +375,8 @@
PARTITION BY device_id
ORDER BY receive_ts DESC
) AS rn
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
FROM alert_history
) alert_history on alert_history.device_id = device_info.device_id
</when>
<otherwise>
alert_history
@ -397,7 +396,6 @@
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
<include refid="deviceDataCommonWhere"/>
<choose>
<when test="searchType == 1">

Loading…
Cancel
Save