From 9ea7115581a3fd60fdf784901fa04b23fd7cb591 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 09:31:11 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 2b64c7b..8d59d01 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
@@ -110,15 +110,15 @@
}
if (code.equals("2")){
HashMap<String, Object> result = new HashMap<>();
-// String time1 = deviceData.get("time").toString();
-// long l = Long.parseLong(time1);
+ String time1 = deviceData.get("time").toString();
+ long l = Long.parseLong(time1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
-// String format1 = simpleDateFormat.format(l);
-// Date date = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ String format1 = simpleDateFormat.format(l);
+ Date date = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
- String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
+ 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