From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 1ff92ee..3c8e2b7 100644
--- a/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -9,4 +9,15 @@
#{mac}
</foreach>
</select>
+
+ <select id="getFiveMinutesDataByMac" resultType="java.util.LinkedHashMap">
+ select
+ <foreach collection="sensorKeys" separator="," item="sensorKey">
+ json->'$.${sensorKey}' AS '${sensorKey}'
+ </foreach>
+ FROM
+ history_five_minutely_${yearAndMonth} h
+ where h.time = #{time}
+ and h.mac = #{mac}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0