From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   64 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index e57f1c8..f71f671 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
@@ -68,14 +68,14 @@
     <select id="getBeamByMacs" resultType="java.util.Map">
         SELECT
         DATE_FORMAT(h.time,#{typeFormat}) time,
-        avg(h.json->'$.e12[0]') beam
+        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������������������������������������������������������ -->
@@ -88,17 +88,63 @@
 
     <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'
+        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>
+        <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 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`,
+            IFNULL(ROUND(AVG(hh.json->"$.e1[0]")),"") as `PM2_5`,IFNULL(ROUND(AVG(hh.json->"$.e2[0]")),"") as 'PM10',IFNULL(ROUND(AVG(hh.json->"$.e10[0]"),1),"") as 'CO',
+            IFNULL(ROUND(AVG(hh.json->"$.e11[0]")),"") as 'SO2',IFNULL(ROUND(AVG(hh.json->"$.e16[0]")),"") as 'NO2',IFNULL(ROUND(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>
+    <select id="getDataByMonitorPoints" resultType="java.util.Map">
+        select hh.time as `time`,
+        IFNULL(ROUND(AVG(hh.json->"$.e1[0]")),"") as `PM2_5`,IFNULL(ROUND(AVG(hh.json->"$.e2[0]")),"") as 'PM10',IFNULL(ROUND(AVG(hh.json->"$.e10[0]"),1),"") as 'CO',
+        IFNULL(ROUND(AVG(hh.json->"$.e11[0]")),"") as 'SO2',IFNULL(ROUND(AVG(hh.json->"$.e16[0]")),"") as 'NO2',IFNULL(ROUND(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 in
+        <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        and hh.time>#{startTime} and hh.time<![CDATA[<=]]>#{endTime} GROUP BY hh.time;
+    </select>
+    <select id="getAvgDataByMId" resultType="java.util.Map">
+        SELECT
+        IFNULL(ROUND(AVG(hh.json->"$.e1[0]")),"") as `PM2_5`,IFNULL(ROUND(AVG(hh.json->"$.e2[0]")),"") as 'PM10',IFNULL(ROUND(AVG(hh.json->"$.e10[0]"),1),"") as 'CO',
+        IFNULL(ROUND(AVG(hh.json->"$.e11[0]")),"") as 'SO2',IFNULL(ROUND(AVG(hh.json->"$.e16[0]")),"") as 'NO2',IFNULL(ROUND(AVG(hh.json->"$.e15[0]")),"") as 'O3_day'
+        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<![CDATA[<=]]>#{endTime} and hh.time>#{startTime}
+    </select>
+    <select id="getAvgDataByMIds" resultType="java.util.Map">
+        SELECT
+        IFNULL(ROUND(AVG(hh.json->"$.e1[0]")),"") as `PM2_5`,IFNULL(ROUND(AVG(hh.json->"$.e2[0]")),"") as 'PM10',IFNULL(ROUND(AVG(hh.json->"$.e10[0]"),1),"") as 'CO',
+        IFNULL(ROUND(AVG(hh.json->"$.e11[0]")),"") as 'SO2',IFNULL(ROUND(AVG(hh.json->"$.e16[0]")),"") as 'NO2',IFNULL(ROUND(AVG(hh.json->"$.e15[0]")),"") as 'O3_day'
+        from monitor_point mt,device d,history_hourly hh where mt.id=d.monitor_point_id
+        and d.mac=hh.mac and mt.id in
+        <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        and hh.time<![CDATA[<=]]>#{endTime} and hh.time>#{startTime}
+
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0