From e4d7da0fc500395f70f13d6c46bd7227c8644ec4 Mon Sep 17 00:00:00 2001 From: liusuyi <13324259@qq.com> Date: 星期三, 29 十一月 2023 21:18:59 +0800 Subject: [PATCH] 增加雷达引导相机跟踪 --- ard-work/src/main/java/com/ruoyi/utils/tube/TubeTools.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/utils/tube/TubeTools.java b/ard-work/src/main/java/com/ruoyi/utils/tube/TubeTools.java index 1508874..9f633bd 100644 --- a/ard-work/src/main/java/com/ruoyi/utils/tube/TubeTools.java +++ b/ard-work/src/main/java/com/ruoyi/utils/tube/TubeTools.java @@ -1,6 +1,7 @@ package com.ruoyi.utils.tube; import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails; +import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.gavaghan.geodesy.Ellipsoid; import org.gavaghan.geodesy.GeodeticCalculator; @@ -52,15 +53,18 @@ } /** - * @鎻忚堪 璁$畻鍧愭爣 - * @鍙傛暟 [ardTubesDetails, alarmPointDistance] - * @杩斿洖鍊� void - * @鍒涘缓浜� 鍒樿嫃涔� - * @鍒涘缓鏃堕棿 2023/6/8 14:38 - * @淇敼浜哄拰鍏跺畠淇℃伅 + * 璁$畻鍧愭爣 + * + * 鍒樿嫃涔� + * 2023/6/8 14:38 */ public static GeoPoint CalculateCoordinates(List<ArdTubesDetails> ardTubesDetails, Integer alarmPointDistance) { try { + if(StringUtils.isNull(alarmPointDistance)) + { + log.debug("鎶ヨ鐐硅窛绂讳负绌猴紝鏃犳硶璁$畻鍧愭爣"); + return null; + } Comparator<ArdTubesDetails> comparator = Comparator.comparingInt(person -> Integer.parseInt(person.getInflectionPointNumber())); // 浣跨敤Collections.sort鏂规硶杩涜鎺掑簭 Collections.sort(ardTubesDetails, comparator); GeoPoint point0 = new GeoPoint(ardTubesDetails.get(0).getLongitude(), ardTubesDetails.get(0).getLatitude(), ardTubesDetails.get(0).getAltitude() - ardTubesDetails.get(0).getDepth()); -- Gitblit v1.9.3