From dc58bb3332a52b945c9ec4d41ccfe3aa34c57c3e Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:38:57 +0800
Subject: [PATCH] update

---
 src/main/resources/mapper/HistoryMapper.xml |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 4ed149c..8a44f87 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -292,5 +292,16 @@
         select `json` from ${table}
 		where  time = #{time} and mac = #{mac}
     </select>
+    <select id="getValueByMacAndTime" resultType="java.lang.String">
+        select `value` from history
+		where  mac = #{mac} and time &gt;= #{time1} and time &lt;=#{time}
+        limit 0,1
+    </select>
+    <select id="getDailyAvgData" resultType="java.util.Map">
+        SELECT  AVG(hd.json->"$.e1[0]") as `PM2_5`,AVG(hd.json->"$.e2[0]") as 'PM10',AVG(hd.json->"$.e10[0]") as 'CO',
+            AVG(hd.json->"$.e11[0]") as 'SO2',AVG(hd.json->"$.e16[0]") as 'NO2',AVG(hd.json->"$.e15[0]") as 'O3_day'
+FROM `history_daily` hd,monitor_point mt,device d where mt.id=d.monitor_point_id
+and d.mac=hd.mac and mt.id=#{mId} and time=#{time}
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0