jwy
/
aeon_dashboard_back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_dashboard_back into zhc

zhc
zhczyx@163.com 2 weeks ago
parent
a2f835e537 6cacc83c96
commit
829569e0ca
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

8
dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
View File

@ -315,12 +315,12 @@
PARTITION BY device_id
ORDER BY receive_ts DESC
) AS rn
FROM alert_history where alert_history.source_type = 1
FROM alert_history
) 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 and alert_history.source_type = 1
left join device_info on alert_history.device_id = device_info.device_id
</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 where alert_history.source_type = 1
FROM alert_history
) 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 and alert_history.source_type = 1
left join device_info on alert_history.device_id = device_info.device_id
</otherwise>
</choose>
left join basic_monitoring_asset on device_info.asset_id = basic_monitoring_asset.equipment_id

Write Preview
Loading…
Cancel
Save