From 256aa4c5431733e5d166f583f03724cf69ddfaa4 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 14 May 2026 11:24:54 +0800
Subject: [PATCH] fix：添加雷达数据
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 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 7002585..d466874 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
@@ -1,7 +1,9 @@
package com.moral.api.kafka.consumer;
import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.HistorySecondRadar;
import com.moral.api.service.*;
+import com.moral.api.util.Method;
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
import lombok.extern.slf4j.Slf4j;
@@ -41,6 +43,8 @@
@Autowired
private HistorySecondUavService historySecondUavService;
+ @Autowired
+ private HistorySecondRadarService historySecondRadarService;
//������������
@KafkaListener(topics = KafkaConstants.TOPIC_MINUTE, containerFactory = "insertListenerContainerFactory")
@@ -144,33 +148,28 @@
public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
-
+ ack.acknowledge();
Map<String, Object> data = JSON.parseObject(msg, Map.class);
Object mac = data.get("mac");
Object time = data.get("DataTime");
if (ObjectUtils.isEmpty(time) || ObjectUtils.isEmpty(mac)) {
log.warn("some properties is null, param{}", msg);
- ack.acknowledge();
return;
- }
- List<String> listDictDevice = Arrays.asList(deviceList.split(","));
- if(!listDictDevice.contains(mac.toString())){
- ack.acknowledge();
}
//������������
data.remove("time");
data.remove("entryTime");
-
+ data.put("DataTime", time);
+ List<String> listDictDevice = Arrays.asList(deviceList.split(","));
+ if(listDictDevice.contains(mac.toString())){
+ //���������������������������
+ data.put("mac", mac);
+ deviceService.judgeDeviceState(data);
+ }
//������������
//data = deviceService.adjustDeviceData(data,"0");
//������redis
- data.put("DataTime", time);
//redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
- //���������������������������
- data.put("mac", mac);
- ack.acknowledge();
- deviceService.judgeDeviceState(data);
-
}catch (CommitFailedException e){
log.error("param{}" + msg);
} catch (Exception e) {
@@ -228,4 +227,25 @@
log.error("param{}" + e);
}
}
+
+ @KafkaListener(topics = KafkaConstants.RADAR_SECOND, containerFactory = "insertListenerContainerFactory")
+ public void listenSecondRadar(ConsumerRecord<String, String> record, Acknowledgment ack) {
+ String msg = record.value();
+ try {
+ msg = msg.replaceAll(",", ";");
+ Map<String, Object> data = Method.getDataStore(msg);
+ Object mac = data.get("QN");
+ Object time = data.get("DataTime");
+ if (ObjectUtils.isEmpty(time) || ObjectUtils.isEmpty(mac)) {
+ log.warn("some properties is null, param{}", msg);
+ ack.acknowledge();
+ return;
+ }
+ int i = 0;
+ historySecondRadarService.insertHistorySecond(data);
+ ack.acknowledge();
+ } catch (Exception e) {
+ log.error("param{}" + e);
+ }
+ }
}
--
Gitblit v1.8.0