From e6c6e6225bdbaaa27bcde320a79acde8239416c2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 30 Jun 2021 10:53:05 +0800
Subject: [PATCH] 定时任务
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 54c9d35..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
@@ -20,7 +20,7 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
-//@Component
+@Component
@Slf4j
public class KafkaConsumer {
@@ -40,7 +40,6 @@
@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");
@@ -59,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();
@@ -89,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();
@@ -101,7 +102,6 @@
@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");
--
Gitblit v1.8.0