From 139338b47c40950539bc6b778afde376b458a482 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 29 Jul 2021 16:46:03 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 201af98..9dc34ab 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -97,21 +97,19 @@
for (Map<String, Object> deviceData : minutelyData) {
if (!ObjectUtils.isEmpty(deviceData)) {
Map<String, Object> minutelyDataMap = new LinkedHashMap<>();
- JSONObject jo = new JSONObject(true);
+ Map<String, Object> map = new HashMap<>();
minutelyDataMap.put("mac", deviceData.get("mac"));
minutelyDataMap.put("time", endTime.toString());
- JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
if (!key.equals("mac") && !key.startsWith("M")) {
List<Object> date = new ArrayList<>();
date.add(deviceData.get(key));
date.add(deviceData.get("MIN" + key));
date.add(deviceData.get("MAX" + key));
- jo.put(key, date);
+ map.put(key, date);
}
}
- jsonArray.add(jo);
- minutelyDataMap.put("json", jsonArray.get(0).toString());
+ minutelyDataMap.put("json", JSONObject.toJSONString(map));
minutelyDataList.add(minutelyDataMap);
}
}
--
Gitblit v1.8.0