From 143d5a9187196d30131838874ba306bfb79ebe77 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 30 Nov 2022 13:07:20 +0800
Subject: [PATCH] 解决国控站数据补偿问题
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 727f821..9ae3b93 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -467,9 +467,9 @@
HashMap<String, Object> result = new HashMap<>();
String dataTime = deviceData.get("DataTime").toString();
Date time = DateUtils.getDate(dataTime, DateUtils.yyyyMMddHHmmss_EN);
- String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
- String format = simpleDateFormat.format(DateUtils.addHours(time, -1));
+ String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
result.put("timeUnits",yearAndMonth);
result.put("mac",mac);
result.put("time",format);
--
Gitblit v1.8.0