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 +55509 -1134
375 changed files with 55509 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5eccb35568 - Show all commits

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

@ -470,17 +470,28 @@
</select> </select>
<select id="getStoragePowerList" resultType="com.xzzn.ems.domain.vo.EnergyStoragePowVo"> <select id="getStoragePowerList" resultType="com.xzzn.ems.domain.vo.EnergyStoragePowVo">
SELECT t.site_id,t.device_id as deviceId, WITH ranked AS (
t.total_active_power AS pcsTotalActPower, SELECT
t.total_reactive_power AS pcsTotalReactivePower, *,
DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay, ROW_NUMBER() OVER(PARTITION BY device_id , DATE_FORMAT(data_update_time, '%Y-%m-%d %H:%i') ORDER BY data_update_time DESC) as rn
DATE_FORMAT(t.data_update_time, '%H:%i:00') AS createDate FROM
FROM ems_pcs_data t ems_pcs_data
WHERE t.site_id = #{siteId} where site_id = #{siteId}
AND t.data_update_time &gt;= #{startDate} and data_update_time &gt;= #{startDate}
AND t.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY) AND data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
AND minute(t.data_update_time) = 0 )
GROUP BY t.site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,dateDay,createDate select
site_id,
device_id as deviceId,
total_active_power as pcsTotalActPower,
total_reactive_power as pcsTotalReactivePower,
DATE_FORMAT(create_time, '%Y-%m-%d') as dateDay,
DATE_FORMAT(data_update_time, '%H:%i:00') as createDate
from
ranked
where
rn = 1
GROUP BY site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,dateDay,createDate
ORDER BY dateDay,createDate ORDER BY dateDay,createDate
</select> </select>