From 0eaefd62a7caa039a4f16e27be279eac5e84da5c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 16 Oct 2023 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 1db4735..528ac65 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.alibaba.fastjson.JSON;
@@ -140,44 +141,39 @@
}
//������������������������������������������������������
- /*@KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
+ @KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
-
+ ack.acknowledge();
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");
data.remove("entryTime");
-
+ data.put("DataTime", time);
+ List<String> listDictDevice = Arrays.asList(deviceList.split(","));
+ if(listDictDevice.contains(mac.toString())){
+ //���������������������������
+ data.put("mac", mac);
+ deviceService.judgeDeviceState(data);
+ }
//������������
//data = deviceService.adjustDeviceData(data,"0");
//������redis
- data.put("DataTime", time);
//redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
- //���������������������������
- data.put("mac", mac);
- ack.acknowledge();
- deviceService.judgeDeviceState(data);
-
}catch (CommitFailedException e){
log.error("param{}" + msg);
} catch (Exception e) {
log.error("param{}" + msg);
ack.acknowledge();
}
- }*/
+ }
//������������������
@KafkaListener(topics = KafkaConstants.UAV_TOPIC_SECOND, groupId = KafkaConstants.GROUP_INSERT, containerFactory = "insertListenerContainerFactory")
@@ -229,3 +225,4 @@
}
}
}
+*/
--
Gitblit v1.8.0