From ad89f4965a05d37aeea1481c4ab53e21ab85ca2f Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 09:32:58 +0800
Subject: [PATCH] 风场图update
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index b428cba..46f16e7 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -56,10 +56,46 @@
<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 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>
+
+ <select id="getTVOCByMacs" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
+ avg(h.json->'$.e17[0]') 'TVOC'
+ 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->'$.e17[0]' is not null
+ group by h.time
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0