From 2b5e23042827c66c936d6aeaa004f42b95236d52 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 31 Jul 2023 13:10:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 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 c67827c..c21f1fb 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
@@ -18,9 +18,8 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
-/*
- * ���������������������
- * */
+
+
@Component
@Slf4j
public class DeviceConsumer {
@@ -36,9 +35,6 @@
@Autowired
private RedisTemplate redisTemplate;
-
- @Autowired
- private HistorySecondSpecialService historySecondSpecialService;
@Autowired
private HistorySecondCruiserService historySecondCruiserService;
@@ -61,7 +57,7 @@
}
//������������
- data.remove("time");
+// data.remove("time");
data.remove("entryTime");
Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
Map<String, Object> newMap = new HashMap<>();
@@ -100,7 +96,7 @@
}
//������������
- data.remove("time");
+// data.remove("time");
data.remove("entryTime");
Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
Map<String, Object> newMap = new HashMap<>();
@@ -126,7 +122,7 @@
//������������������������������������������������������
@KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
- public void listenSecond(ConsumerRecord<String, String> record) {
+ public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
Map<String, Object> data = JSON.parseObject(msg, Map.class);
@@ -141,13 +137,14 @@
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);
//���������������������������
data.put("mac", mac);
deviceService.judgeDeviceState(data);
+ ack.acknowledge();
} catch (Exception e) {
log.error("param{}" + msg);
}
@@ -157,7 +154,6 @@
@KafkaListener(topics = KafkaConstants.UAV_TOPIC_SECOND, groupId = KafkaConstants.GROUP_INSERT, containerFactory = "insertListenerContainerFactory")
public void listenSecondSpecial(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
- System.out.println(msg);
try {
Map<String, Object> data = JSON.parseObject(msg, Map.class);
Object mac = data.get("mac");
@@ -180,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 {
@@ -200,7 +196,7 @@
historySecondCruiserService.insertHistorySecond(data);
ack.acknowledge();
} catch (Exception e) {
- log.error("param{}" + msg);
+ log.error("param{}" + e);
}
}
}
--
Gitblit v1.8.0