From 409851cc3f33d3fd016e20518f90a2c093e9e1db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 19 May 2020 16:58:54 +0800
Subject: [PATCH] alarm相关接口更新
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 8f5404c..5f6a59c 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -10,10 +10,10 @@
history_hourly
<where>
<if test="mac!=null">
- AND mac=#{mac}
+ AND mac = #{mac}
</if>
<if test="time!=null">
- AND time= DATE_SUB(#{time}, INTERVAL 1 HOUR)
+ AND time = DATE_SUB(#{time}, INTERVAL 1 HOUR)
</if>
</where>
</select>
@@ -25,35 +25,31 @@
AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
</foreach>
FROM
- history h
- <where>
- <if test="mac!=null">
- and h.mac=#{mac}
- </if>
- </where>
+ <if test="mac!=null and time!=null">
+ (select mac,value,time,version from history
+ where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 HOUR) and #{time}) h
+ </if>
GROUP BY
DATE_FORMAT(time,'%Y-%m-%d %H')
<if test="time!=null">
- having time=DATE_FORMAT(DATE_SUB(#{time}, INTERVAL 1 HOUR),'%Y-%m-%d %H')
+ having time = DATE_FORMAT(DATE_SUB(#{time}, INTERVAL 1 HOUR),'%Y-%m-%d %H')
</if>
</select>
<select id="getPollutionSourceDataAll" resultType="java.util.Map">
- SELECT
- DATE_FORMAT(time,'%Y-%m-%d %H') time,
- <foreach collection="sensorKeys" separator="," item="sensorKey">
- AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
- </foreach>
- FROM
- history h
- <where>
+ SELECT
+ DATE_FORMAT(time,'%Y-%m-%d %H') time,
+ <foreach collection="sensorKeys" separator="," item="sensorKey">
+ AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
+ </foreach>
+ FROM
<if test="mac!=null">
- and h.mac=#{mac}
+ (select mac,value,time,version from history
+ where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 DAY) and #{time}) h
</if>
- </where>
- GROUP BY
- DATE_FORMAT(time,'%Y-%m-%d %H')
- order by time desc
- limit 0,1
+ GROUP BY
+ DATE_FORMAT(time,'%Y-%m-%d %H')
+ order by time desc
+ limit 0,1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0