From 7f33dd19c55ef3980129ff3034f9eaf89a9bcf58 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 30 Nov 2020 17:27:01 +0800
Subject: [PATCH] 修改monitorPointMapper

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 8e819ef..e74be91 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
@@ -100,7 +100,12 @@
     </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}
@@ -112,4 +117,32 @@
             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`,
+        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 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 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_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 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_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