From 8aa815dd9fca6dc914c0cba72ada9af5c795a44c Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 28 Apr 2020 15:19:42 +0800
Subject: [PATCH] update 1小时插入一次
---
src/main/resources/mapper/HistoryMapper.xml | 2 +-
src/main/java/com/moral/task/HistoryTableInsertTask.java | 12 ++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 009c19b..a9f9c19 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -20,7 +20,6 @@
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;
@@ -891,16 +890,13 @@
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);
+ devices.put("time", value);
try {
- List<History> historyData = historyService.selectByMacAndTime(devices);
- if (!CollectionUtils.isEmpty(historyData)) {
- int count = historyService.insertHistorySpecialTable(devices);
- XxlJobLogger.log("insertHistorySpecialTable:" + count);
+ int count = historyService.insertHistorySpecialTable(devices);
+ XxlJobLogger.log("insertHistorySpecialTable:" + count);
+ if (count > 0) {
ReturnT returnT = new ReturnT(200, "������historySpecial���������");
return returnT;
}
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index b2b22d9..19bf540 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -170,7 +170,7 @@
<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>
--
Gitblit v1.8.0