From 7e25fda3cfb8a7fc785cb6261a888671fb146fbe Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Nov 2020 14:13:13 +0800
Subject: [PATCH] 从history获取数据接口更新为从history日表获取

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

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