From a46f5f1db19dc1af644a4ed013bb12555621e135 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 21 May 2020 14:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/HistoryMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index b2b22d9..044b959 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -170,10 +170,17 @@
     <insert id="insertHistorySpecialTable">
         insert into
         history_special(mac, value, time,version)
-        SELECT * from history WHERE time = #{time} and mac in
+        SELECT * from history WHERE time>=DATE_SUB(#{time}, INTERVAL 1 HOUR) and time<![CDATA[<]]>#{time} and mac in
         <foreach collection="macList" index="index" item="mac" open="(" separator="," close=")">
             #{mac}
         </foreach>
     </insert>
 
+    <delete id="deleteHistoryData" parameterType="java.lang.String">
+        delete from history3 where  time &lt; #{oldTime};
+    </delete>
+    <update id="deletePartition">
+        ALTER table history3 drop PARTITION ${p};
+    </update>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0