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

数据20250904优化-点位数据接口增加入参

Browse Source
This commit is contained in:
mashili
2025-09-13 19:25:58 +08:00
parent bfdbc4f42c
commit ecbe55cdbf
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,9 @@
<foreach collection="siteIds" item="siteId" open="(" close=")" separator=",">
#{siteId}
</foreach>
<if test="deviceId != null and deviceId != ''">
and device_id = #{deviceId}
</if>
GROUP BY valueDate, site_id, device_id,pointValue
ORDER BY site_id,device_id, valueDate ASC
</select>
@ -259,6 +262,9 @@
<foreach collection="siteIds" item="siteId" open="(" close=")" separator=",">
#{siteId}
</foreach>
<if test="deviceId != null and deviceId != ''">
and device_id = #{deviceId}
</if>
GROUP BY site_id, device_id, hour_group
) tmp ON t.site_id = tmp.site_id
AND t.device_id = tmp.device_id
@ -285,6 +291,9 @@
<foreach collection="siteIds" item="siteId" open="(" close=")" separator=",">
#{siteId}
</foreach>
<if test="deviceId != null and deviceId != ''">
and device_id = #{deviceId}
</if>
GROUP BY site_id, device_id, day_group
) tmp ON t.site_id = tmp.site_id
AND t.device_id = tmp.device_id