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

平台修改意见20251120-设备监控实时运行页面数据图按照小时展示，共用时间范围，新增时间查询条件

Browse Source
This commit is contained in:
gaojinming
2025-11-25 14:23:26 +08:00
parent 7298acc785
commit a5e977c0d1
11 changed files with 232 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -461,13 +461,14 @@
SELECT t.site_id,t.device_id as deviceId,
t.total_active_power AS pcsTotalActPower,
t.total_reactive_power AS pcsTotalReactivePower,
DATE_FORMAT(t.data_update_time, '%Y-%m-%d %H:%i:00') AS createDate
DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(t.data_update_time, '%H:%i:00') AS createDate
FROM ems_pcs_data t
WHERE t.site_id = #{siteId}
AND t.data_update_time >= Date(#{startDate})
AND t.data_update_time <= #{endDate}
GROUP BY t.site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,createDate
ORDER BY createDate
AND Date(t.data_update_time) between #{startDate} and #{endDate}
AND minute(t.data_update_time) = 0
GROUP BY t.site_id, deviceId,pcsTotalActPower,pcsTotalReactivePower,dateDay,createDate
ORDER BY dateDay,createDate
</select>
<select id="getPcsDataByMonth" resultType="com.xzzn.ems.domain.vo.SiteMonitorDataVo">
@ -581,18 +582,19 @@
COALESCE(t.v_temperature, -999),
COALESCE(t.w_temperature, -999)
) AS temp,
latest.dateHour as createDate
DATE_FORMAT(latest.dateHour, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(latest.dateHour, '%H:%i:00') AS createDate
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
WHERE p.site_id = #{siteId}
AND p.data_update_time &gt;= Date(#{startDate})
AND p.data_update_time &lt;= #{endDate}
AND Date(p.data_update_time) between #{startDate} and #{endDate}
AND minute(p.data_update_time) = 0
GROUP BY p.site_id, p.device_id,dateHour
) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
AND latest.device_id = t.device_id
AND latest.max_update_time = t.data_update_time
group by deviceId,createDate,temp
order by createDate desc
group by deviceId,dateDay,createDate,temp
order by dateDay,createDate
</select>
<select id="getDDSMaxTemp" parameterType="com.xzzn.ems.domain.vo.DateSearchRequest" resultType="com.xzzn.ems.domain.vo.PcsMaxTempVo">
@ -603,17 +605,18 @@
COALESCE(t.module3_temp, -999),
COALESCE(t.module4_temp, -999)
) AS temp,
latest.dateHour as createDate
DATE_FORMAT(latest.dateHour, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(latest.dateHour, '%H:%i:00') AS createDate
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
WHERE p.site_id = #{siteId}
AND p.data_update_time &gt;= Date(#{startDate})
AND p.data_update_time &lt;= #{endDate}
AND Date(p.data_update_time) between #{startDate} and #{endDate}
AND minute(p.data_update_time) = 0
GROUP BY p.site_id, p.device_id,dateHour
) latest inner join ems_pcs_data t ON latest.site_id = t.site_id
AND latest.device_id = t.device_id
AND latest.max_update_time = t.data_update_time
group by deviceId,createDate,temp
order by createDate desc
group by deviceId,dateDay,createDate,temp
order by dateDay,createDate
</select>
</mapper>