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 ++++++------
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 12 ++++++------
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 22 +++++++++++-----------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index 30041ec..1f80531 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -99,18 +99,18 @@
}
//������������
- data.remove("time");
+// data.remove("time");
data.remove("entryTime");
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String format = dateFormat.format(new Date().getTime());
- //������������
- String substring = format.substring(0, 4);
-
- String substring1 = time.toString().substring(0, 4);
-
- String replace = time.toString().replace(substring1, substring);
-
- data.put("DataTime",replace);
+// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// String format = dateFormat.format(new Date().getTime());
+// //������������
+// String substring = format.substring(0, 4);
+//
+// String substring1 = time.toString().substring(0, 4);
+//
+// String replace = time.toString().replace(substring1, substring);
+//
+// data.put("DataTime",replace);
Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
Map<String, Object> newMap = new HashMap<>();
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 5bc892c..8643c9a 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,13 +51,13 @@
Map<String, Object> versionInfo = (Map<String, Object>) deviceInfo.get("version");
Integer version = (Integer) versionInfo.get("id");
//���������������
-// String time1 = data.get("time").toString();
-// long l = Long.parseLong(time1);
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
-// String format1 = dateFormat.format(l);
-// Date time = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ String time1 = data.get("time").toString();
+ long l = Long.parseLong(time1);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00: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);
+// Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
result.put("mac", mac);
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