From 8a6b8211f09d0371483341fbe7906d3952d6da27 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Thu, 03 Aug 2023 12:02:05 +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