From 8bb0e02e8fd166f35782870983fd2140142df409 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 30 Nov 2020 15:52:12 +0800
Subject: [PATCH] 获取账户地图信息添加权限校验
---
src/main/resources/mapper/HistoryMapper.xml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 0fd5fcf..08223f6 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -13,7 +13,7 @@
d.`name`,
</if>
<foreach collection="sensorKeys" separator="," item="sensorKey">
- AVG(h.`value` ->'$.${sensorKey}') AS '${sensorKey}'
+ AVG(h.json ->'$.${sensorKey}[0]') AS '${sensorKey}'
</foreach>
FROM
history_${timeUnits} h,
@@ -164,7 +164,7 @@
</select>
<select id="getAVGValueByMacAndTimeslot" resultType="java.util.Map">
- SELECT AVG(JSON_EXTRACT(value,'$.e1[0]')) e1,AVG(JSON_EXTRACT(value,'$.e2[0]')) e2,AVG(JSON_EXTRACT(value,'$.e10[0]')) e10,AVG(JSON_EXTRACT(value,'$.e11[0]')) e11,AVG(JSON_EXTRACT(value,'$.e16[0]')) e16,AVG(JSON_EXTRACT(value,'$.e15[0]')) e15
+ SELECT AVG(JSON_EXTRACT(value,'$.e1')) e1,AVG(JSON_EXTRACT(value,'$.e2')) e2,AVG(JSON_EXTRACT(value,'$.e10')) e10,AVG(JSON_EXTRACT(value,'$.e11')) e11,AVG(JSON_EXTRACT(value,'$.e16')) e16,AVG(JSON_EXTRACT(value,'$.e15')) e15
FROM history_${timeUnits}
WHERE mac = #{mac}
AND time >= #{starttime}
@@ -196,7 +196,7 @@
</select>
<select id="getAVGSensorRankByMonitorPointIdList" resultType="java.util.Map">
- SELECT mp.name, AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) sensor
+ SELECT mp.name, AVG(JSON_EXTRACT(h.value,'$.${sensor}')) sensor
FROM device d, history_${timeUnits} h, monitor_point mp
WHERE d.mac=h.mac
And mp.id=d.monitor_point_id
@@ -206,11 +206,11 @@
</foreach>
AND h.time BETWEEN #{before5Time} AND #{endTime}
GROUP BY d.monitor_point_id
- ORDER BY AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) DESC
+ ORDER BY AVG(JSON_EXTRACT(h.value,'$.${sensor}')) DESC
</select>
<select id="getMonitorPointAVGValueByMonitorPointIdAndTimeslot" resultType="java.util.Map">
- SELECT AVG(JSON_EXTRACT(value,'$.e1[0]')) e1,AVG(JSON_EXTRACT(value,'$.e2[0]')) e2,AVG(JSON_EXTRACT(value,'$.e10[0]')) e10,AVG(JSON_EXTRACT(value,'$.e11[0]')) e11,AVG(JSON_EXTRACT(value,'$.e16[0]')) e16,AVG(JSON_EXTRACT(value,'$.e15[0]')) e15
+ SELECT AVG(JSON_EXTRACT(value,'$.e1')) e1,AVG(JSON_EXTRACT(value,'$.e2')) e2,AVG(JSON_EXTRACT(value,'$.e10')) e10,AVG(JSON_EXTRACT(value,'$.e11')) e11,AVG(JSON_EXTRACT(value,'$.e16')) e16,AVG(JSON_EXTRACT(value,'$.e15')) e15
FROM device d,history_${timeUnits} h
WHERE d.monitor_point_id = #{monitor_point_id}
AND d.mac = h.mac
@@ -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