From f2cfc6973ec1b43391654b4bd722c2c316d06fc7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 19 Nov 2020 13:08:24 +0800
Subject: [PATCH] 增加删除天表代码

---
 src/main/java/com/moral/task/HistoryTableCreatAndDeleteTask.java |   20 ++++++++++++++------
 src/main/java/com/moral/service/HistoryService.java              |    2 ++
 src/main/java/com/moral/service/impl/HistoryServiceImpl.java     |    5 +++++
 src/main/java/com/moral/mapper/HistoryMapper.java                |    2 ++
 src/main/resources/mapper/HistoryMapper.xml                      |    4 ++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index ce7c160..08e6a4c 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -35,4 +35,6 @@
 
     void createHistoryTable(@Param("yearMonthDay") String yearMonthDay);
 
+    void dropHistoryTable(@Param("yearMonthDay") String yearMonthDay);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 2b226a8..7165556 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -16,4 +16,6 @@
     void deletePartition(String p);
 
     void createHistoryTable(String yearMonthDay);
+
+    void dropHistoryTable(String yearMonthDay);
 }
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 25986c4..51e7bf8 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -41,4 +41,9 @@
     public void createHistoryTable(String yearMonthDay) {
         historyMapper.createHistoryTable(yearMonthDay);
     }
+
+    @Override
+    public void dropHistoryTable(String yearMonthDay) {
+        historyMapper.dropHistoryTable(yearMonthDay);
+    }
 }
diff --git a/src/main/java/com/moral/task/HistoryTableCreatAndDeleteTask.java b/src/main/java/com/moral/task/HistoryTableCreatAndDeleteTask.java
index 99f4a4d..9baa08a 100644
--- a/src/main/java/com/moral/task/HistoryTableCreatAndDeleteTask.java
+++ b/src/main/java/com/moral/task/HistoryTableCreatAndDeleteTask.java
@@ -22,20 +22,28 @@
 
     @XxlJob("deleteHitoryTable")
     public ReturnT deleteHistoryTable(String param) {
-       return new ReturnT(200,"������������");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String yearMonthDay = sdf.format(DateUtil.rollHour(new Date(), -8*24));
+        try {
+            historyService.dropHistoryTable(yearMonthDay);
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+            return new ReturnT(500, "history_" + yearMonthDay + "������������");
+        }
+        return new ReturnT(200, "history_" + yearMonthDay + "������������");
     }
 
     @XxlJob("createHistoryTable")
     public ReturnT createHistoryTable(String param) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String yearMonthDay = sdf.format(DateUtil.rollHour(new Date(), 24));
         try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String yearMonthDay = sdf.format(DateUtil.rollHour(new Date(), 24));
             historyService.createHistoryTable(yearMonthDay);
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error(e.getMessage());
-            return new ReturnT(500,"history������������");
+            return new ReturnT(500, "history_" + yearMonthDay + "������������");
         }
-        return new ReturnT(200,"history������������������");
+        return new ReturnT(200, "history_" + yearMonthDay + "������������");
     }
 
 }
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 0b3770c..743b83f 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -259,4 +259,8 @@
         KEY `_idx_time` (`time`) USING BTREE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC
     </update>
+
+    <delete id="dropHistoryTable" parameterType="String">
+        drop table history_${yearMonthDay}
+    </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0