From 1dfc2c2708fba01b771a2edd24c83363ee7c84d0 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 09 Apr 2020 14:32:09 +0800
Subject: [PATCH] update设备跳转到实时界面
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 770c396..3c4b0f8 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -11,7 +11,7 @@
AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
</foreach>
FROM
- history_minutely
+ history_minutely_${yearAndMonth}
WHERE
mac IN
(SELECT
@@ -141,7 +141,9 @@
SELECT
DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
<foreach collection="sensorKeys" item="sensorKey" separator=",">
- hm.json->'$.${sensorKey}[0]' as '${sensorKey}'
+ hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
+ hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
+ hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
</foreach>
FROM
history_minutely as hm
@@ -156,14 +158,16 @@
hm.time
</select>
- <select id="getSensorDataMin" resultType="java.util.LinkedHashMap">
+ <select id="getSensorData2020" resultType="java.util.LinkedHashMap">
SELECT
DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
<foreach collection="sensorKeys" item="sensorKey" separator=",">
- hm.json->'$.${sensorKey}[1]' as '${sensorKey}'
+ hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
+ hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
+ hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
</foreach>
FROM
- history_minutely as hm
+ history_minutely_${yearAndMonth} as hm
<where>
<if test="mac!=null">
and hm.mac=#{mac}
@@ -175,22 +179,4 @@
hm.time
</select>
- <select id="getSensorDataMax" resultType="java.util.LinkedHashMap">
- SELECT
- DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
- <foreach collection="sensorKeys" item="sensorKey" separator=",">
- hm.json->'$.${sensorKey}[2]' as '${sensorKey}'
- </foreach>
- FROM
- history_minutely as hm
- <where>
- <if test="mac!=null">
- and hm.mac=#{mac}
- </if>
- and hm.time >= #{startTime}
- and hm.time <![CDATA[<=]]> #{endTime}
- </where>
- ORDER BY
- hm.time
- </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0