From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Sat, 13 Jan 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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..791557b 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) {
//当每次上报只上报一个追踪信息，认为不太可能雷达扫描一次会跟踪多个目标
+ ArdAlarmRadar ardFollowRadar = ardFollowRadars.get(0);
String radarId = radarFollowData.getRadarId();//雷达id
//这里追踪的坐标为雷达经过计算上传的经纬度
Double longitude = ardFollowRadar.getLongitude();
--
Gitblit v1.9.3