From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 45ce8b7..360ff73 100644
--- a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -12,15 +12,24 @@
h.value->'$.a01008' AS windDir
FROM history_five_minutely_${timeUnits} h ,
`device` AS d
- WHERE d.mac = h.mac
- AND d.mac IN
- (SELECT mac FROM device WHERE monitor_point_id IN
- <foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
- #{monitorPointId}
- </foreach>
- )
+ WHERE d.is_delete = '0'
+ AND d.mac = h.mac
+ AND d.monitor_point_id IN
+ <foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
+ #{monitorPointId}
+ </foreach>
AND h.time = (SELECT max(time) FROM history_five_minutely_${timeUnits})
- AND d.is_delete = '0'
</select>
+ <select id="listResult" resultType="com.moral.api.entity.HistoryFiveMinutely">
+ SELECT mac,time,value FROM history_five_minutely${table}
+ WHERE (mac = #{mac} AND time BETWEEN #{startDate} AND #{endDate})
+ order by time desc
+ </select>
+ <select id="listResultOne" resultType="com.moral.api.entity.HistoryFiveMinutely">
+ SELECT mac,time,value FROM history_five_minutely${table}
+ WHERE (mac = #{mac})
+ order by time desc
+ limit 1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0