From 5c3994e0166baff540d323a779573299a56feec6 Mon Sep 17 00:00:00 2001
From: yuzixiang <yzx123456>
Date: Fri, 22 May 2020 15:38:10 +0800
Subject: [PATCH] 计算臭氧平缓平均值（更新）
---
src/main/resources/mapper/HistoryMapper.xml | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 2a7dfb0..0ab705d 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -183,7 +183,7 @@
history h
<where>
<if test="mac!=null">
- and h.mac=#{mac}
+ and h.mac = #{mac}
</if>
and h.time >= #{startTime}
and h.time <![CDATA[<=]]> #{endTime}
@@ -193,21 +193,21 @@
ORDER BY
time
</select>
-
+
<select id="getAVGSensorRankByMonitorPointIdList" resultType="java.util.Map">
- SELECT mp.name, AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) sensor
- FROM device d, history h, monitor_point mp
- WHERE d.mac=h.mac
- And mp.id=d.monitor_point_id
- AND d.monitor_point_id IN
- <foreach collection="monitorPointIdList" index="index" item="monitorPointId" open="(" separator="," close=")">
- #{monitorPointId}
- </foreach>
- AND h.time BETWEEN #{before5Time} AND #{endTime}
- GROUP BY d.monitor_point_id
- ORDER BY AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) DESC
+ SELECT mp.name, AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) sensor
+ FROM device d, history h, monitor_point mp
+ WHERE d.mac=h.mac
+ And mp.id=d.monitor_point_id
+ AND d.monitor_point_id IN
+ <foreach collection="monitorPointIdList" index="index" item="monitorPointId" open="(" separator="," close=")">
+ #{monitorPointId}
+ </foreach>
+ AND h.time BETWEEN #{before5Time} AND #{endTime}
+ GROUP BY d.monitor_point_id
+ ORDER BY AVG(JSON_EXTRACT(h.value,'$.${sensor}[0]')) 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
FROM device d,history h
@@ -227,7 +227,7 @@
history_special as h
<where>
<if test="mac!=null">
- and h.mac=#{mac}
+ and h.mac = #{mac}
</if>
and h.time >= #{startTime}
and h.time <![CDATA[<]]> #{endTime}
@@ -246,7 +246,7 @@
history as h
<where>
<if test="mac!=null">
- and h.mac=#{mac}
+ and h.mac = #{mac}
</if>
and h.time >= #{startTime}
and h.time <![CDATA[<]]> #{endTime}
@@ -255,4 +255,16 @@
h.time
</select>
+ <select id="getNum" resultType="java.lang.Integer">
+ select count(*) from history_hourly where time <![CDATA[>=]]> #{timef} and time <![CDATA[<=]]> #{timea}
+ </select>
+ <select id="getO3AVG" resultType="java.util.LinkedHashMap">
+ select DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s') time,json->'$.e15[0]' as e15
+ FROM history_hourly
+ where time <![CDATA[>=]]>#{date}
+ and time <![CDATA[<]]>#{nextDate}
+ and mac=#{mac}
+ ORDER BY `time`
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0