From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 5f6a59c..3d5ca95 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -26,7 +26,7 @@
         </foreach>
         FROM
         <if test="mac!=null and time!=null">
-            (select mac,value,time,version from history
+            (select mac,value,time,version from history_${yearAndDay}
             where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 HOUR) and #{time}) h
         </if>
         GROUP BY
@@ -44,7 +44,7 @@
         </foreach>
         FROM
         <if test="mac!=null">
-            (select mac,value,time,version from history
+            (select mac,value,time,version from history_${yearAndDay}
             where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 DAY) and #{time}) h
         </if>
         GROUP BY
@@ -52,4 +52,69 @@
         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>
+    <select id="getDataByMacAndTime1" 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`<![CDATA[<]]>#{endTime}
+    </select>
+    <select id="getDataAvbByMIdAndTime" resultType="java.util.Map">
+        select hh.time as `time`,
+            AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
+            AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3'
+            from monitor_point mt,device d,history_hourly hh
+            where mt.id=d.monitor_point_id and d.mac=hh.mac and mt.id=#{mId} and hh.time>#{startTime} and hh.time<![CDATA[<=]]>#{endTime} GROUP BY hh.time;
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0