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

概率统计-电量指标

Browse Source
This commit is contained in:
mashili
2025-07-01 16:25:23 +08:00
parent d24da5363a
commit ed025d2750
9 changed files with 257 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml
View File

@ -151,7 +151,7 @@
</select>
<select id="getAllClusterInfoByStackId" parameterType="String" resultType="java.util.Map">
select distinct t.device_id,t.device_name from ems_devices_setting t where t.parent_id = #{stackDeviceId}
select distinct t.device_id as id,t.device_name as deviceName from ems_devices_setting t where t.parent_id = #{stackDeviceId}
</select>
<select id="getAllBatteryDeviceBySiteId" parameterType="String" resultType="com.xzzn.ems.domain.EmsDevicesSetting">

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

@ -379,6 +379,10 @@
from ( SELECT p.site_id, p.device_id,p.date_month,p.date_day, MAX(p.data_update_time) AS max_update_time
FROM ems_pcs_data p
where p.site_id = #{siteId}
<if test="startDate != null and endDate != null">
and p.data_update_time &gt;= #{startDate}
and p.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
</if>
GROUP BY p.site_id,p.device_id,p.date_month,p.date_day
) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
AND latest.device_id = t.device_id
@ -386,6 +390,6 @@
and latest.date_month = t.date_month
and latest.date_day = t.date_day
group by ammeterDate
order by ammeterDate desc
order by ammeterDate desc;
</select>
</mapper>