From 923e745c19cc286235628b4b29f16a1bd4f168cb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 16 Sep 2020 11:23:54 +0800
Subject: [PATCH] update

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 5f6a59c..ceee292 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -52,4 +52,54 @@
         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,#{typeFormat}) time,
+        cast(AVG(h.json->'$.e12[0]') as UNSIGNED integer) '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 h.time
+    </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,#{typeFormat}) time,
+        round(avg(h.json->'$.e17[0]'),3) '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>
+
+    <select id="getDataByMacAndTime" resultType="java.util.Map">
+        SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,json->'$.${sensor}[0]' as ${sensor} FROM `history_hourly` where `mac`=#{mac} and `time`&gt;=#{startTime} and `time`&lt;#{endTime}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0