From ef1e469fd3e885b9238bc1ef5e8d82b3a43bd55b Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期三, 29 十一月 2023 20:07:29 +0800
Subject: [PATCH] 增加雷达跟踪引导上传
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 18 ++++++++++--------
src/main/java/com/ard/alarm/radar/domain/RadarAlarmData.java | 2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ard/alarm/radar/domain/RadarAlarmData.java b/src/main/java/com/ard/alarm/radar/domain/RadarAlarmData.java
index 8cf17ec..e6269d5 100644
--- a/src/main/java/com/ard/alarm/radar/domain/RadarAlarmData.java
+++ b/src/main/java/com/ard/alarm/radar/domain/RadarAlarmData.java
@@ -17,5 +17,5 @@
String radarName;
String alarmTime;
List<ArdAlarmRadar> ardAlarmRadars;
- List<ArdAlarmRadar> ardFollowRadars;
+ ArdAlarmRadar ardFollowRadar;
}
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index 7065348..8956726 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -13,6 +13,7 @@
import io.netty.channel.SimpleChannelInboundHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import javax.xml.bind.DatatypeConverter;
import java.net.InetSocketAddress;
@@ -195,7 +196,7 @@
// log.info("鏈夋晥璐熻浇澶у皬(杞暣鍨�):" + payloadSizeToDecimal);
//endregion
List<ArdAlarmRadar> radarAlarmInfos = new ArrayList<>();
- List<ArdAlarmRadar> radarFollowInfos = new ArrayList<>();
+ ArdAlarmRadar radarFollowInfo = null;
//鎶芥补鏈虹姸鎬侀浄杈炬帹閫侀泦鍚�
List<ArdAlarmRadar> well = new ArrayList<>();
String alarmTime = "";
@@ -320,11 +321,12 @@
ardAlarmRadar.setLatitude(alarmXY[1]);
ardAlarmRadar.setAlarmType(alarmType);
radarAlarmInfos.add(ardAlarmRadar);
- int bit1 = (cStat[0]>>1) & 0x1;;
+ int bit1 = (cStat[0] >> 1) & 0x1;
//鐩爣鐨凚1=1 閿佸畾
- if(bit1==1) {
- //灏嗛攣瀹氱洰鏍囨斁鍏ラ攣瀹歭ist
- radarFollowInfos.add(ardAlarmRadar);
+ if (bit1 == 1) {
+ radarFollowInfo = ardAlarmRadar;
+ //灏嗚拷韪攣瀹氱殑鎶ヨ瀵硅薄灞炴�у鍒剁粰radarFollowInfo瀵硅薄
+ //BeanUtils.copyProperties(ardAlarmRadar, radarFollowInfo);
}
}
//endregion
@@ -340,9 +342,9 @@
radarAlarmData.setAlarmTime(alarmTime);
radarAlarmData.setArdAlarmRadars(radarAlarmInfos);
MqttProducer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData));
- if(radarFollowInfos.size()>0) {
- radarAlarmData.setArdFollowRadars(radarFollowInfos);
- MqttProducer.publish(2, false, "radarFollowGuide", JSON.toJSONString(radarAlarmData));
+ if (radarFollowInfo != null) {
+ //褰撳墠闆疯揪鎵弿瀛樺湪寮曞璺熻釜鏁版嵁锛屽彧淇濈暀鏈�鍚庝竴娆￠攣瀹氱殑鏁版嵁
+ MqttProducer.publish(2, false, "radarFollowGuide", JSON.toJSONString(radarFollowInfo));
}
//鎶芥补鏈虹姸鎬丮QTT闃熷垪
radarAlarmData.setArdAlarmRadars(well);
--
Gitblit v1.9.3