From 8fb013a6d6707929799e9f7a8a82f311cbca29ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Dec 2020 14:47:04 +0800
Subject: [PATCH] update大屏年，月数据查询接口
---
src/main/resources/mapper/HistoryMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 7d08573..47bd34f 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -301,10 +301,21 @@
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
+ IFNULL(ROUND(AVG(hd.json->"$.e1[0]")),"") as `PM2_5`,IFNULL(ROUND(AVG(hd.json->"$.e2[0]")),"") as 'PM10',IFNULL(ROUND(AVG(hd.json->"$.e10[0]"),1),"") as 'CO',
+ IFNULL(ROUND(AVG(hd.json->"$.e11[0]")),"") as 'SO2',IFNULL(ROUND(AVG(hd.json->"$.e16[0]")),"") as 'NO2',IFNULL(ROUND(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>
-
+ <select id="getDailyAvgDataByMIds" resultType="java.util.Map">
+ SELECT
+ IFNULL(ROUND(AVG(hd.json->"$.e1[0]")),"") as `PM2_5`,IFNULL(ROUND(AVG(hd.json->"$.e2[0]")),"") as 'PM10',IFNULL(ROUND(AVG(hd.json->"$.e10[0]"),1),"") as 'CO',
+ IFNULL(ROUND(AVG(hd.json->"$.e11[0]")),"") as 'SO2',IFNULL(ROUND(AVG(hd.json->"$.e16[0]")),"") as 'NO2',IFNULL(ROUND(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