From 9f965bfa801be97c4683ae53bcb4ce897228fd14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 15:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 2780fe2..bc272cd 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
@@ -1,3 +1,4 @@
+/*
package com.moral.api.kafka.consumer;
import com.moral.api.service.*;
@@ -18,9 +19,11 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
+*/
/*
* ���������������������
- * */
+ * *//*
+
@Component
@Slf4j
public class DeviceConsumer {
@@ -58,7 +61,7 @@
}
//������������
- data.remove("time");
+// data.remove("time");
data.remove("entryTime");
Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
Map<String, Object> newMap = new HashMap<>();
@@ -200,3 +203,4 @@
}
}
}
+*/
--
Gitblit v1.8.0