From 3152a4e4dadcd6ebfb8e882aa356d063416d49cc Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 09:58:26 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

---
 src/main/java/com/moral/mapper/HistoryMapper.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index d9ac919..08e6a4c 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -4,24 +4,37 @@
 import java.util.Map;
 
 import com.moral.entity.History;
+import org.apache.ibatis.annotations.Param;
 
 public interface HistoryMapper {
     int insert(History record);
 
     int insertSelective(History record);
 
-	Map<String, Object> getAvgData(Map<String,Object> parameters);
-	
-	Map<String, Object> getMaxAndMinData(Map<String,Object> parameters);
+    Map<String, Object> getAvgData(Map<String, Object> parameters);
 
-    List<Map<String, Object>> getSensorData(Map<String,Object> parameters);
+    Map<String, Object> getMaxAndMinData(Map<String, Object> parameters);
 
-    List<Map<String, Object>> getSensorDataByMac(Map<String,Object> parameters);
+    List<Map<String, Object>> getSensorData(Map<String, Object> parameters);
 
-    List<Map<String, Object>> getSensorDataByMacOnce(Map<String,Object> parameters);
+    List<Map<String, Object>> getSensorDataByMac(Map<String, Object> parameters);
 
-    List<Map<String, Object>> getSensorDataOnce(Map<String,Object> parameters);
-	
-	Map<String, Object> getMinData(Map<String,Object> parameters);
+    List<Map<String, Object>> getSensorDataByMacOnce(Map<String, Object> parameters);
+
+    List<Map<String, Object>> getSensorDataOnce(Map<String, Object> parameters);
+
+    Map<String, Object> getMinData(Map<String, Object> parameters);
+
+    List<History> selectByMacAndTime(Map<String, Object> parameters);
+
+    int insertHistorySpecialTable(Map<String, Object> parameters);
+
+    int deleteHistoryData(String oldTime);
+
+    void deletePartition(@Param("p") String p);
+
+    void createHistoryTable(@Param("yearMonthDay") String yearMonthDay);
+
+    void dropHistoryTable(@Param("yearMonthDay") String yearMonthDay);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0