From a97c42ad398252b9b69cabc3494a45a79064eec8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Aug 2023 16:26:15 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
index 1eb53a5..6d6bce9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
@@ -561,7 +561,13 @@
for (Map<String, Object> map : list) {
HistoryDaily historyDaily = new HistoryDaily();
String time = map.remove("time").toString();
- Date date = DateUtils.dateStringToDate(time);
+ Date date=null;
+ if (time.length()>20){
+ date = DateUtils.dateStringToDate(time);
+ }else {
+ date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ }
+
String mac = map.remove("mac").toString();
String value = JSONObject.toJSONString(map);
historyDaily.setMac(mac);
--
Gitblit v1.8.0