From 16500ff805484fb876ff9736d21021b242f1d7cd Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 01 Jul 2021 09:03:55 +0800
Subject: [PATCH] screen-manage 添加websocket实时界面
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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..94ec2f1 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,11 +17,10 @@
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;
-//@Component
+@Component
@Slf4j
public class KafkaConsumer {
@@ -33,9 +32,6 @@
@Autowired
private DeviceService deviceService;
-
- @Autowired
- private AdjustDataUtils adjustDataUtils;
@Autowired
private RedisTemplate redisTemplate;
@@ -62,6 +58,7 @@
return !(key.contains("Min") || key.contains("Max") || key.contains("Cou"));
}).collect(Collectors.toMap(m -> m.getKey().replaceAll("-Avg", ""), Map.Entry::getValue));
data.remove("time");
+ data.remove("entryTime");
//���������������
historyMinutelyService.insertHistoryMinutely(data);
ack.acknowledge();
@@ -92,6 +89,7 @@
return !(key.contains("Min") || key.contains("Max") || key.contains("Cou"));
}).collect(Collectors.toMap(m -> m.getKey().replaceAll("-Avg", ""), Map.Entry::getValue));
data.remove("time");
+ data.remove("entryTime");
//���������������
historyHourlyService.insertHistoryHourly(data);
ack.acknowledge();
@@ -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