From c21faf5a484f6bc52e252536d890e508a82ae222 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 17 Sep 2020 14:00:29 +0800
Subject: [PATCH] 走行车无人机特殊mac定时任务
---
src/main/resources/mapper/HistoryMapper.xml | 2 +-
src/main/java/com/moral/task/HistoryTableInsertTask.java | 19 +++++++++++--------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 8af56a4..0e6bfa2 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -1,14 +1,10 @@
package com.moral.task;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.annotation.Resource;
@@ -332,10 +328,17 @@
public ReturnT insertHistorySpecialTable(String params) {
Map macMap = JSON.parseObject(params);
List<String> macList = (List<String>) macMap.get("mac");
- LocalDateTime value = LocalDateTime.now();
+ SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Calendar calendar=Calendar.getInstance();
+ Date date=calendar.getTime();
+ String s=format.format(date);
+ calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 1);
+ Date date1=calendar.getTime();
+ String s1=format.format(date1);
Map<String, Object> devices = new HashMap<>();
devices.put("macList", macList);
- devices.put("time", value);
+ devices.put("startTime", s);
+ devices.put("endTime", s1);
try {
int count = historyService.insertHistorySpecialTable(devices);
XxlJobLogger.log("insertHistorySpecialTable:" + count);
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 6d16309..b74a825 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>=DATE_SUB(#{time}, INTERVAL 1 HOUR) and time<![CDATA[<]]>#{time} and mac in
+ SELECT * from history WHERE time>=#{startTime} and time<![CDATA[<]]>#{endTime} and mac in
<foreach collection="macList" index="index" item="mac" open="(" separator="," close=")">
#{mac}
</foreach>
--
Gitblit v1.8.0