From 22f8bf0630187800c47c3907eecfedcc13abc540 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 02 Apr 2020 17:11:17 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index ac2d823..113e307 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -53,6 +53,15 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ if (day == 1) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
LocalDateTime endTime = time.truncatedTo(ChronoUnit.MINUTES);
@@ -74,7 +83,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -136,7 +145,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -189,7 +198,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -243,7 +252,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -297,7 +306,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -351,7 +360,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -405,7 +414,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -460,7 +469,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -492,6 +501,15 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ if (day == 1) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
LocalDateTime endTime = time.truncatedTo(ChronoUnit.HOURS);
@@ -516,7 +534,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -586,7 +604,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -650,7 +668,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -709,7 +727,7 @@
dailyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -771,7 +789,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -836,7 +854,7 @@
minutelyDataMap.put("time", deviceData.get("time"));
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M")) {
+ if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
--
Gitblit v1.8.0