From ab5be023c958c42791e9be14f8eac2a3a1f49c26 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 22 Dec 2022 15:46:17 +0800
Subject: [PATCH] 国控站数据维护问题2

---
 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java |    6 +++---
 1 files changed, 3 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 4c8f423..a00b64c 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
@@ -138,7 +138,7 @@
             data.remove("entryTime");
 
             //������������
-            data = deviceService.adjustDeviceData(data);
+            data = deviceService.adjustDeviceData(data,"0");
             //������redis
             data.put("DataTime", time);
             redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
@@ -176,7 +176,7 @@
     }
 
     //������������������
-    @KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, groupId = KafkaConstants.GROUP_INSERT, containerFactory = "insertListenerContainerFactory")
+    @KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, containerFactory = "insertListenerContainerFactory")
     public void listenSecondCruiser(ConsumerRecord<String, String> record, Acknowledgment ack) {
         String msg = record.value();
         try {
@@ -196,7 +196,7 @@
             historySecondCruiserService.insertHistorySecond(data);
             ack.acknowledge();
         } catch (Exception e) {
-            log.error("param{}" + msg);
+            log.error("param{}" + e);
         }
     }
 }

--
Gitblit v1.8.0