From 0188e1e69bbbd794af99cba71496e25aba18ed98 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 02 Apr 2020 17:18:04 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 113e307..c2437db 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -83,7 +83,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -145,7 +145,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -198,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") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -252,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") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -306,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") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -360,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") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -414,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") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -469,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") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -534,7 +534,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -604,7 +604,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -668,7 +668,7 @@
hourlyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -727,7 +727,7 @@
dailyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
if (deviceData.get("MIN" + key) instanceof String) {
@@ -789,7 +789,7 @@
minutelyDataMap.put("time", startTime);
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.startsWith("M") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
@@ -854,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") && !key.equals("time")) {
+ if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
--
Gitblit v1.8.0