From e702400b2e1bfd27f6176ea95a5c4d130417a1a4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Jun 2021 11:20:05 +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 | 10 ++++------
1 files changed, 4 insertions(+), 6 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 cc98e98..54c9d35 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
@@ -17,7 +17,6 @@
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryHourlyService;
import com.moral.api.service.HistoryMinutelyService;
-import com.moral.api.util.AdjustDataUtils;
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
@@ -35,15 +34,13 @@
private DeviceService deviceService;
@Autowired
- private AdjustDataUtils adjustDataUtils;
-
- @Autowired
private RedisTemplate redisTemplate;
//������������
@KafkaListener(topics = KafkaConstants.TOPIC_MINUTE, groupId = KafkaConstants.GROUP_ID_INSERT, containerFactory = "kafkaListenerContainerFactory")
public void listenMinute(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
+ System.out.println(msg);
try {
Map<String, Object> data = JSON.parseObject(msg, HashMap.class);
Object mac = data.get("mac");
@@ -104,6 +101,7 @@
@KafkaListener(topics = KafkaConstants.TOPIC_SECOND, groupId = KafkaConstants.GROUP_ID_STATE, containerFactory = "kafkaListenerContainerFactory")
public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
+ //System.out.println(record.offset() + "===>" + msg);
try {
Map<String, Object> data = JSON.parseObject(msg, HashMap.class);
Object mac = data.get("mac");
@@ -115,9 +113,9 @@
return;
}
//������������
- data = adjustDataUtils.adjust(data);
+ data = deviceService.adjustDeviceData(data);
//������redis
- redisTemplate.opsForValue().set(RedisConstants.DEVICE_DATA + "_" + mac, data);
+ redisTemplate.opsForValue().set(RedisConstants.DEVICE_DATA + mac, data);
//���������������������������
deviceService.judgeDeviceState(data);
ack.acknowledge();
--
Gitblit v1.8.0