From 0670dde143770e6b9f3a3a91e1768e5acd504126 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 07 Aug 2020 18:02:41 +0800
Subject: [PATCH] update
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 5f6a59c..ad65123 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -52,4 +52,37 @@
order by time desc
limit 0,1
</select>
+
+ <select id="getTVOCByMac" resultType="java.lang.String">
+ select json->'$.${sensor}[0]' as e17 from history_hourly where mac=#{mac} and time=#{time}
+ </select>
+
+ <select id="getPressureByMac" resultType="java.lang.String">
+ select json->'$.e28[0]' as e28 from history_hourly where mac=#{mac} and time=#{time}
+ </select>
+
+ <select id="getDataByMac" resultType="java.util.Map">
+ select json from history_hourly where mac=#{mac} and time=#{time}
+ </select>
+
+ <select id="getBeamByMacs" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
+ avg(h.json->'$.e12[0]') beam
+ FROM history_hourly h
+ WHERE h.mac in
+ <foreach item="item" collection="macs" index="index" open="(" separator="," close=")">#{item}</foreach>
+ and h.time >= #{start}
+ AND h.time <![CDATA[<]]> #{end}
+ and h.json->'$.e12[0]' is not null
+ group by DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s')
+ </select>
+
+ <!-- ������������mac������������������������������������������������������ -->
+ <select id="getDataByTimeSlot" resultType="java.util.Map">
+ SELECT *
+ FROM history_hourly
+ where mac=#{mac}
+ AND time between #{startTime} and #{endTime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0