From c534d4ac66958e9f2e9be2d9d7587c55fb3bb42f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 17 Apr 2020 11:12:27 +0800
Subject: [PATCH] add 走航车等设备的history表数据重新存一份

---
 src/main/java/com/moral/task/HistoryTableInsertTask.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index c2437db..009c19b 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -20,10 +20,12 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.moral.entity.History;
 import com.moral.service.DeviceService;
 import com.moral.service.HistoryDailyService;
 import com.moral.service.HistoryHourlyService;
 import com.moral.service.HistoryMinutelyService;
+import com.moral.service.HistoryService;
 import com.moral.service.SensorService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -38,6 +40,9 @@
 
     @Resource
     private DeviceService deviceService;
+
+    @Resource
+    private HistoryService historyService;
 
     @Resource
     private HistoryMinutelyService historyMinutelyService;
@@ -881,4 +886,31 @@
         return returnT;
     }
 
+    @XxlJob("historySpecial")
+    public ReturnT insertHistorySpecialTable(String params) {
+        Map macMap = JSON.parseObject(params);
+        List<String> macList = (List<String>) macMap.get("mac");
+        LocalDateTime value = LocalDateTime.now();
+        LocalDateTime time = value.truncatedTo(ChronoUnit.SECONDS);
+        LocalDateTime tenSecondsAgo = time.minusSeconds(10);
+        Map<String, Object> devices = new HashMap<>();
+        devices.put("macList", macList);
+        devices.put("time", tenSecondsAgo);
+        try {
+            List<History> historyData = historyService.selectByMacAndTime(devices);
+            if (!CollectionUtils.isEmpty(historyData)) {
+                int count = historyService.insertHistorySpecialTable(devices);
+                XxlJobLogger.log("insertHistorySpecialTable:" + count);
+                ReturnT returnT = new ReturnT(200, "������historySpecial���������");
+                return returnT;
+            }
+        } catch (Exception e) {
+            XxlJobLogger.log("insertHistorySpecialTableException:" + e.getMessage());
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+        ReturnT returnT = new ReturnT(500, "������historySpecial���������");
+        return returnT;
+    }
+
 }

--
Gitblit v1.8.0