From f32e22e52376cabe49e8c7d1f52adb4b1aebffd3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 20 Nov 2019 17:15:08 +0800
Subject: [PATCH] update：移动到设备marker上实时显示因子数据
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 8f5404c..ba3c970 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -25,12 +25,10 @@
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">
@@ -45,12 +43,10 @@
AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
</foreach>
FROM
- history h
- <where>
<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
--
Gitblit v1.8.0