From a5c3fa1fc06f4b9ca60bf1df64ee7c07285d2870 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 03 Nov 2020 10:45:42 +0800
Subject: [PATCH] device_adjust_value_Timing表相关文件
---
src/main/java/com/moral/task/HistoryFiveMinutelyTask.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java b/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java
index 9f2196c..2c1f33e 100644
--- a/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java
+++ b/src/main/java/com/moral/task/HistoryFiveMinutelyTask.java
@@ -80,7 +80,7 @@
});
String keyAndValueJson = JSON.toJSONString(keyAndValueMap);
insertDataMap.put("mac", mac);
- insertDataMap.put("time", params.get("start"));
+ insertDataMap.put("time", params.get("end"));
insertDataMap.put("json", keyAndValueJson);
insertDatas.add(insertDataMap);
}
@@ -114,12 +114,14 @@
if (endMinute >= 5) {
StringBuilder time = new StringBuilder(sdf.format(date));
startTime = time.replace(15, 19, "0:00").toString();
- endTime = time.replace(15, 19, "4:00").toString();
+ endTime = time.replace(15, 19, "5:00").toString();
} else {
+ StringBuilder endTimesb = new StringBuilder(sdf.format(date));
+ endTime = endTimesb.replace(15, 19, "0:00").toString();
date = DateUtil.rollMinute(date, -5);
- StringBuilder time = new StringBuilder(sdf.format(date));
- startTime = time.replace(15, 19, "5:00").toString();
- endTime = time.replace(15, 19, "9:00").toString();
+ StringBuilder startTimesb = new StringBuilder(sdf.format(date));
+ startTime = startTimesb.replace(15, 19, "5:00").toString();
+
}
year = DateUtil.getYear(date);
--
Gitblit v1.8.0