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

单体电池-增加簇号

Browse Source
This commit is contained in:
mashili
2025-07-01 13:28:50 +08:00
parent 342439e3a9
commit d24da5363a
5 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,16 +179,18 @@
<select id="getAllBatteryDataByClusterId" resultType="com.xzzn.ems.domain.vo.BatteryDataStatsListVo">
SELECT t.data_timestamp as updateTime, t.voltage, t.temperature,
t.soc, t.soh, t.device_id as deviceId
t.soc, t.soh, t.device_id as deviceId,t.cluster_device_id as clusterDeviceId
FROM ems_battery_data t
JOIN ( SELECT device_id, MAX(data_timestamp) AS max_update_time
INNER JOIN ( SELECT device_id, cluster_device_id, MAX(data_timestamp) AS max_update_time
FROM ems_battery_data
WHERE site_id = #{siteId}
and data_timestamp >= CURDATE()
<if test="clusterDeviceId != null and clusterDeviceId != ''">
and cluster_device_id = #{clusterDeviceId}
</if>
GROUP BY device_id
GROUP BY device_id, cluster_device_id
) latest ON t.device_id = latest.device_id AND t.data_timestamp = latest.max_update_time
AND t.cluster_device_id = latest.cluster_device_id
WHERE t.site_id = #{siteId}
<if test="clusterDeviceId != null and clusterDeviceId != ''">
and t.cluster_device_id = #{clusterDeviceId}