From f976feb7ae339c006af150b30802f7edfc8d966f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 09:05:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 e9de5ec..710d3e1 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
@@ -8,22 +8,22 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
+import java.util.*;
@Component
@Slf4j
public class DeviceConsumer {
+ @Value("${result.device.list}")
+ private String deviceList;
@Autowired
private HistoryMinutelyService historyMinutelyService;
@@ -144,12 +144,18 @@
public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
+
Map<String, Object> data = JSON.parseObject(msg, Map.class);
Object mac = data.get("mac");
Object time = data.get("DataTime");
if (ObjectUtils.isEmpty(time) || ObjectUtils.isEmpty(mac)) {
log.warn("some properties is null, param{}", msg);
+ ack.acknowledge();
return;
+ }
+ List<String> listDictDevice = Arrays.asList(deviceList.split(","));
+ if(!listDictDevice.contains(mac.toString())){
+ ack.acknowledge();
}
//������������
data.remove("time");
@@ -166,6 +172,7 @@
ack.acknowledge();
} catch (Exception e) {
log.error("param{}" + msg);
+ ack.acknowledge();
}
}
--
Gitblit v1.8.0