From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 0de8ee6..360ff73 100644
--- a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -21,4 +21,15 @@
AND h.time = (SELECT max(time) FROM history_five_minutely_${timeUnits})
</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