From 8f3ca8c62a6d175085743ff2292dc8eb23ee1d35 Mon Sep 17 00:00:00 2001
From: wujingtao <wujingtao_t@126.com>
Date: Tue, 8 Mar 2022 13:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E8=BD=BD=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=97=B6=E9=97=B4=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StatisticsDmpServiceImpl.java         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java
index b18bffa..9b13a8f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
@@ -88,13 +89,16 @@ public class StatisticsDmpServiceImpl implements StatisticsDmpService {
         List<String> row0 = new ArrayList<>();
         row0.add("imei");
         row0.add("tag");
+        row0.add("time");
         data.add(row0);
         map.forEach((k, v) -> {
-            List<String> list = (List<String>) v;
-            for (String info : list) {
+            List<Object> list = (List<Object>) v;
+            for (Object info : list) {
+                JSONObject object = (JSONObject) info;
                 List<String> rows = new ArrayList<>();
-                rows.add(info);
+                rows.add(object.getStr("imei"));
                 rows.add(k);
+                rows.add(object.getStr("gmtCreate"));
                 data.add(rows);
             }
         });