From 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 08:24:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 bc272cd..5ee1a09 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
@@ -11,6 +11,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;
@@ -19,10 +22,7 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
-*/
-/*
- * ���������������������
- * *//*
+
@Component
@Slf4j
@@ -100,8 +100,19 @@
}
//������������
-// 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);
+
Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
Map<String, Object> newMap = new HashMap<>();
Map.Entry<String, Object> next;
@@ -126,7 +137,7 @@
//������������������������������������������������������
@KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
- public void listenSecond(ConsumerRecord<String, String> record) {
+ public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
Map<String, Object> data = JSON.parseObject(msg, Map.class);
@@ -148,6 +159,7 @@
//���������������������������
data.put("mac", mac);
deviceService.judgeDeviceState(data);
+ ack.acknowledge();
} catch (Exception e) {
log.error("param{}" + msg);
}
--
Gitblit v1.8.0