From 2c8ca9db2471c33943c20882061a2c87bb99d7f0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 09:32:53 +0800
Subject: [PATCH] fix:秒级数据调整

---
 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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..7002585 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;
@@ -161,14 +162,17 @@
             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();

--
Gitblit v1.8.0