From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 43a663e..3d5ca95 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -26,7 +26,7 @@
</foreach>
FROM
<if test="mac!=null and time!=null">
- (select mac,value,time,version from history
+ (select mac,value,time,version from history_${yearAndDay}
where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 HOUR) and #{time}) h
</if>
GROUP BY
@@ -44,7 +44,7 @@
</foreach>
FROM
<if test="mac!=null">
- (select mac,value,time,version from history
+ (select mac,value,time,version from history_${yearAndDay}
where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 DAY) and #{time}) h
</if>
GROUP BY
--
Gitblit v1.8.0