From 66309ec82964316c3ae032fdcf2742d59179922c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 05 Jan 2023 14:55:05 +0800
Subject: [PATCH] 列表数据导出
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 62a4269..a0944c6 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -51,7 +51,7 @@
Integer version = (Integer) versionInfo.get("id");
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
- String yearAndMonth = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
result.put("mac", mac);
result.put("time", DateUtils.addHours(time, -1));
@@ -62,7 +62,7 @@
historyHourlyMapper.insertHistoryHourly(result);
//������������
- dataAdjust = deviceService.adjustDeviceData(dataAdjust);
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust,"2");
//������������������insert
result.put("timeUnits", yearAndMonth);
--
Gitblit v1.8.0