From cb59966a148f601c41e77637be701fda04251d91 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 14 Jun 2022 14:14:53 +0800
Subject: [PATCH] 添加需要离线报警程序，分钟数据统计往前移一分钟
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 9dc34ab..bc20ac7 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -67,8 +67,10 @@
public ReturnT insertHistoryMinutelyTable(String params) {
//������������������
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");
- Date endTimeDate = new Date();
- Date startTimeDate = DateUtil.rollMinute(endTimeDate, -1);
+ Date insertTimeDate = new Date();
+ Date startTimeDate = DateUtil.rollMinute(insertTimeDate, -2);
+ Date endTimeDate = DateUtil.rollMinute(insertTimeDate, -1);
+ StringBuilder insertTime = new StringBuilder(sdf.format(insertTimeDate));
StringBuilder endTime = new StringBuilder(sdf.format(endTimeDate));
StringBuilder startTime = new StringBuilder(sdf.format(startTimeDate));
String queryYearAndMonthDay = DateUtil.getYear(startTimeDate) + DateUtil.getMonth(startTimeDate) + DateUtil.getDay(startTimeDate);
@@ -99,7 +101,7 @@
Map<String, Object> minutelyDataMap = new LinkedHashMap<>();
Map<String, Object> map = new HashMap<>();
minutelyDataMap.put("mac", deviceData.get("mac"));
- minutelyDataMap.put("time", endTime.toString());
+ minutelyDataMap.put("time", insertTime.toString());
for (String key : deviceData.keySet()) {
if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
--
Gitblit v1.8.0