From 6450fec60b8dc7e6d31779bcfe3b23b3f665ebaf Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 28 Dec 2021 15:08:45 +0800
Subject: [PATCH] screen-api            更新单位转换代码

---
 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 51167ed..5fac9b4 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
@@ -44,9 +44,9 @@
         result.put("version", version);
 
         Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
-        result.put("time", time);
+        result.put("time", DateUtils.getDateOfMin(time, -1));
         result.put("value", JSONObject.toJSONString(data));
-        String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);
+        String timeUnits = DateUtils.dateToDateString(DateUtils.getDateOfMin(time, -1), DateUtils.yyyyMM_EN);
         result.put("timeUnits", timeUnits + "_" + Constants.UN_ADJUST);
 
         //���������������������������

--
Gitblit v1.8.0