dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
374 changed files with 55610 additions and 1130 deletions
Showing only changes of commit f05ba30f14 - Show all commits

View File

@ -382,12 +382,14 @@
</select>
<select id="getSiteRunningHeadInfo" parameterType="String" resultType="com.xzzn.ems.domain.vo.SiteMonitorRunningHeadInfoVo">
SELECT
SUM(t.total_active_power) as totalActivePower,
SUM(t.total_reactive_power) as totalReactivePower,
sum(t.daily_ac_charge_energy) as dayChargedCap,
sum(t.daily_ac_discharge_energy) as dayDisChargedCap
SELECT SUM(pd.total_active_power) as totalActivePower,
SUM(pd.total_reactive_power) as totalReactivePower,
sum(pd.daily_ac_charge_energy) as dayChargedCap,
sum(pd.daily_ac_discharge_energy) as dayDisChargedCap
FROM (
SELECT
t.*, ROW_NUMBER() OVER(PARTITION BY t.device_id ORDER BY t.data_update_time desc) AS rn
FROM (
SELECT p.device_id, MAX(p.data_update_time) AS max_update_time
FROM ems_pcs_data p
where p.site_id = #{siteId}
@ -395,6 +397,8 @@
) latest inner join ems_pcs_data t ON latest.device_id = t.device_id
AND latest.max_update_time = t.data_update_time
AND t.site_id = #{siteId}
) AS pd
WHERE rn = 1;
</select>
<select id="getElectDataList" resultType="com.xzzn.ems.domain.vo.ElectricIndexList">