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/kafka/consumer/DeviceConsumer.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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<>();
--
Gitblit v1.8.0