From 1d7e1b771160dd8b7f25765e402ce25cac676641 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 15:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/HistoryMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 7d08573..08223f6 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -303,8 +303,17 @@
<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}
+ 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>
-
+ <select id="getDailyAvgDataByMIds" 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 in
+ <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ and time=#{time}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0