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 |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 c21f1fb..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
@@ -10,6 +10,9 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -98,6 +101,17 @@
             //������������
 //            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);
+
             Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
             Map<String, Object> newMap = new HashMap<>();
             Map.Entry<String, Object> next;

--
Gitblit v1.8.0