From 07a0a0b4506b365b44d4cdbf3ced3c5f678ec8d6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Apr 2023 08:28:28 +0800
Subject: [PATCH] 处理设备分钟时间延迟问题
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 10 ++++++++--
1 files changed, 8 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 586d8bf..ad01177 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
@@ -5,6 +5,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -42,8 +43,13 @@
result.put("mac", mac);
result.put("version", version);
-
- Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+// String time1 = data.get("time").toString();
+ String time2 = data.remove("time").toString();
+ long l = Long.parseLong(time2);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");
+ String format1 = dateFormat.format(l);
+ Date time = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+// 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(DateUtils.getDateOfMin(time, -1), DateUtils.yyyyMM_EN);
--
Gitblit v1.8.0