From e6c6e6225bdbaaa27bcde320a79acde8239416c2 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 30 Jun 2021 10:53:05 +0800 Subject: [PATCH] 定时任务 --- screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java index 9360a70..216be2a 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java @@ -30,8 +30,8 @@ Object mac = data.remove("mac"); result.put("mac", mac); result.put("version", data.remove("ver")); - Date time = new Date(new Long((String) data.remove("DataTime"))); - result.put("time", DateUtils.dataToTimeStampTime(time,DateUtils.yyyy_MM_dd_HH_mm_EN)); + Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN); + result.put("time", time); result.put("value", JSONObject.toJSONString(data)); String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN); result.put("timeUnits", tableSuffix(timeUnits, Constants.UN_ADJUST)); -- Gitblit v1.8.0