From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index aa83d96..ceee292 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -67,14 +67,39 @@
 
     <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
+        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>
+        <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')
+        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