xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +28555 -1041
245 changed files with 28555 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 097709d403 - Show all commits

8
ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
View File

@ -585,7 +585,9 @@
latest.dateHour as createDate
from ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%Y-%m-%d %H:00:00') AS dateHour,MAX(p.data_update_time) as max_update_time
FROM ems_pcs_data p
<include refid="statisCommonFilter"/>
WHERE p.site_id = #{siteId}
AND p.data_update_time &gt;= Date(#{startDate})
AND p.data_update_time &lt;= #{endDate}
GROUP BY p.site_id, p.device_id,dateHour
) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
AND latest.device_id = t.device_id
@ -605,7 +607,9 @@
latest.dateHour as createDate
from ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%Y-%m-%d %H:00:00') AS dateHour,MAX(p.data_update_time) as max_update_time
FROM ems_pcs_data p
<include refid="statisCommonFilter"/>
WHERE p.site_id = #{siteId}
AND p.data_update_time &gt;= Date(#{startDate})
AND p.data_update_time &lt;= #{endDate}
GROUP BY p.site_id, p.device_id,dateHour
) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
AND latest.device_id = t.device_id