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

修复站点-电动所内部实时运行查询报错问题

Browse Source
This commit is contained in:
zq
2025-11-30 10:26:03 +08:00
parent b38bc36ad6
commit c068e7d4ab
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
View File

@ -331,10 +331,14 @@
DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay, DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(t.create_time, '%H:00:00') AS createDate DATE_FORMAT(t.create_time, '%H:00:00') AS createDate
from ems_battery_cluster t from ems_battery_cluster t
where t.site_id = #{siteId} WHERE t.site_id = #{siteId}
AND Date(t.create_time) between #{startDate} and #{endDate} AND t.create_time >= #{startDate}
GROUP BY t.site_id,dateDay,createDate AND t.create_time < DATE_ADD(#{endDate}, INTERVAL 1 DAY)
order by dateDay,createDate GROUP BY t.site_id,
DATE_FORMAT(t.create_time, '%Y-%m-%d'),
DATE_FORMAT(t.create_time, '%H:00:00')
ORDER BY dateDay, createDate
</select> </select>
<select id="getClusterDataByHour" resultType="com.xzzn.ems.domain.vo.ClusterStatisListVo"> <select id="getClusterDataByHour" resultType="com.xzzn.ems.domain.vo.ClusterStatisListVo">

16
ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
View File

@ -347,14 +347,17 @@
<select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo"> <select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo">
select t.site_id, select t.site_id,
round(avg(t.avg_cell_temp)) as batteryTemp, round(avg(t.avg_temperature)) as batteryTemp,
DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay, DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(t.create_time, '%H:00:00') AS createDate DATE_FORMAT(t.create_time, '%H:00:00') AS createDate
from ems_battery_stack t from ems_battery_stack t
where t.site_id = #{siteId} WHERE t.site_id = #{siteId}
AND Date(t.create_time) between #{startDate} and #{endDate} AND t.create_time &gt;= #{startDate}
GROUP BY t.site_id,dateDay,createDate AND t.create_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
order by dateDay,createDate GROUP BY t.site_id,
DATE_FORMAT(t.create_time, '%Y-%m-%d'),
DATE_FORMAT(t.create_time, '%H:00:00')
ORDER BY dateDay, createDate
</select> </select>
<sql id="statisCommonFilter"> <sql id="statisCommonFilter">
@ -499,7 +502,8 @@
DATE_FORMAT(t.create_time, '%H:00:00') AS createDate DATE_FORMAT(t.create_time, '%H:00:00') AS createDate
from ems_battery_stack t from ems_battery_stack t
where t.site_id = #{siteId} where t.site_id = #{siteId}
AND Date(t.create_time) between #{startDate} and #{endDate} AND t.create_time &gt;= #{startDate}
AND t.create_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
GROUP BY t.site_id,dateDay,createDate GROUP BY t.site_id,dateDay,createDate
order by dateDay,createDate order by dateDay,createDate
</select> </select>

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

@ -465,7 +465,8 @@
DATE_FORMAT(t.data_update_time, '%H:%i:00') AS createDate DATE_FORMAT(t.data_update_time, '%H:%i:00') AS createDate
FROM ems_pcs_data t FROM ems_pcs_data t
WHERE t.site_id = #{siteId} WHERE t.site_id = #{siteId}
AND Date(t.data_update_time) between #{startDate} and #{endDate} AND t.data_update_time &gt;= #{startDate}
AND t.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
AND minute(t.data_update_time) = 0 AND minute(t.data_update_time) = 0
GROUP BY t.site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,dateDay,createDate GROUP BY t.site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,dateDay,createDate
ORDER BY dateDay,createDate ORDER BY dateDay,createDate
@ -587,7 +588,8 @@
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 ( 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 FROM ems_pcs_data p
WHERE p.site_id = #{siteId} WHERE p.site_id = #{siteId}
AND Date(p.data_update_time) between #{startDate} and #{endDate} AND p.data_update_time &gt;= #{startDate}
AND p.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
AND minute(p.data_update_time) = 0 AND minute(p.data_update_time) = 0
GROUP BY p.site_id, p.device_id,dateHour GROUP BY p.site_id, p.device_id,dateHour
) latest inner join ems_pcs_data t ON latest.site_id = t.site_id ) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
@ -610,7 +612,8 @@
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 ( 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 FROM ems_pcs_data p
WHERE p.site_id = #{siteId} WHERE p.site_id = #{siteId}
AND Date(p.data_update_time) between #{startDate} and #{endDate} AND p.data_update_time &gt;= #{startDate}
AND p.data_update_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
AND minute(p.data_update_time) = 0 AND minute(p.data_update_time) = 0
GROUP BY p.site_id, p.device_id,dateHour GROUP BY p.site_id, p.device_id,dateHour
) latest inner join ems_pcs_data t ON latest.site_id = t.site_id ) latest inner join ems_pcs_data t ON latest.site_id = t.site_id