From 9d91dc402f279630eaa100024fd3b1542fbeb41c Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 22 Dec 2021 11:04:41 +0800 Subject: [PATCH] 分钟,5分钟,小时表存入非本月数据bug修复 --- screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 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 69bf01c..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 @@ -46,7 +46,7 @@ Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN); 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