From 65ce763aa478661c8da3214a5aa812a0ce24c04d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 20 Feb 2023 15:05:21 +0800
Subject: [PATCH] 修改kafka小数数据时间问题
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
index 4b5dea2..021bf30 100644
--- a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
@@ -107,9 +107,15 @@
}
if (code.equals("2")){
HashMap<String, Object> result = new HashMap<>();
- String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
+ String time1 = deviceData.get("time").toString();
+ long l = Long.parseLong(time1);
+
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
- String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
+ String format1 = simpleDateFormat.format(l);
+ Date date = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(date, -2), DateUtils.yyyyMM_EN);
+ String format = simpleDateFormat.format(DateUtils.addHours(date, -2));
result.put("timeUnits",yearAndMonth);
result.put("mac",mac);
result.put("time",format);
--
Gitblit v1.8.0