From e399f702d76b2b170956a5996b5364f148b54b8d Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 10 Sep 2020 15:13:37 +0800
Subject: [PATCH] 三天因子对比（update）

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index fc16813..e57f1c8 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -67,8 +67,8 @@
 
     <select id="getBeamByMacs" resultType="java.util.Map">
         SELECT
-        DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
-        round(avg(h.json->'$.e12[0]'),0) beam
+        DATE_FORMAT(h.time,#{typeFormat}) 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>
@@ -77,4 +77,28 @@
         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>
+    <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