From 6c47588406827fa706e4068c692de3be0ae0188e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 04 Dec 2023 11:04:26 +0800
Subject: [PATCH] 雷达引导追踪优化
---
ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java | 5 +++--
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java
index 438a133..b3d437b 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java
@@ -27,5 +27,5 @@
private Date alarmTime;
private List<ArdAlarmRadar> ardAlarmRadars;
/**雷达跟踪引导数据*/
- private ArdAlarmRadar ardFollowRadars;
+ private List<ArdAlarmRadar> ardFollowRadars;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
index e97ed12..9539b06 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
@@ -94,9 +94,10 @@
try {
RadarAlarmData radarFollowData = JSONObject.parseObject(msg, RadarAlarmData.class);
if (radarFollowData != null) {
- ArdAlarmRadar ardFollowRadar = radarFollowData.getArdFollowRadars();
- if (ardFollowRadar != null) {
+ List<ArdAlarmRadar> ardFollowRadars = radarFollowData.getArdFollowRadars();
+ if (ardFollowRadars.size()>0) {
//当每次上报只上报一个追踪信息，认为不太可能雷达扫描一次会跟踪多个目标
+ ardFollowRadars.get(0)
String radarId = radarFollowData.getRadarId();//雷达id
//这里追踪的坐标为雷达经过计算上传的经纬度
Double longitude = ardFollowRadar.getLongitude();
--
Gitblit v1.9.3