From 2acb2c049b0c6708b14f28b0cdf1e62f486cb019 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 16:58:16 +0800
Subject: [PATCH] fix:补偿提交

---
 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 9ae8bad..1db4735 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
@@ -5,6 +5,7 @@
 import com.moral.constant.KafkaConstants;
 import com.moral.constant.RedisConstants;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.CommitFailedException;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -139,7 +140,7 @@
     }
 
     //������������������������������������������������������
-    @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 {
@@ -161,19 +162,22 @@
             data.remove("entryTime");
 
             //������������
-            data = deviceService.adjustDeviceData(data,"0");
+            //data = deviceService.adjustDeviceData(data,"0");
             //������redis
             data.put("DataTime", time);
-            redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
+            //redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
             //���������������������������
             data.put("mac", mac);
-            deviceService.judgeDeviceState(data);
             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")

--
Gitblit v1.8.0