From 578b6efb20248f244ce7bd46c26361c79e5270f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 13:59:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
index c257205..34ebc45 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
@@ -20,7 +20,7 @@
 import com.moral.constant.KafkaConstants;
 import com.moral.constant.RedisConstants;
 
-//@Component
+@Component
 @Slf4j
 public class KafkaConsumer {
 
@@ -133,7 +133,7 @@
             //������������
             data = deviceService.adjustDeviceData(data);
             //������redis
-            redisTemplate.opsForHash().put(RedisConstants.DEVICE_DATA, mac, data);
+            redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
             //���������������������������
             deviceService.judgeDeviceState(data);
             ack.acknowledge();

--
Gitblit v1.8.0