From 344d9006faa27ea65e3eaf5e8f9173aad2266038 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期三, 23 七月 2025 17:23:53 +0800 Subject: [PATCH] 2025.7.23 1. 动态溯源模块完成,发布 --- src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt index 563466a..fe2e325 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt @@ -26,6 +26,8 @@ windLevelCondition: RTExcWindLevelConfig.WindLevelCondition?, ) : this() { distanceType = windLevelCondition?.distanceType + distanceRange = distanceType?.disRange + distanceDes = distanceType?.des windLevelCondition?.let { sourceTrace(historyData, exceptionData, config, it) } } @@ -39,6 +41,9 @@ // 姹℃煋鍙兘鐨勫彂鐢熻窛绂� var distanceType: DistanceType? = null + + var distanceRange: Pair<Double, Double>? = null + var distanceDes: String? = null /** * 鍙嶅悜婧簮 @@ -72,6 +77,7 @@ try { val address = AMapService.reGeo(pair) this.address = address.district + address.township + address.street + Thread.sleep(100) } catch (e: Exception) { e.printStackTrace() } @@ -102,7 +108,7 @@ // result.add(center) var startDeg = 0 while (startDeg <= 360) { - val p = MapUtil.getPointByLen(center, 50.0, startDeg * PI / 180) + val p = MapUtil.getPointByLen(center, distanceRange.second, startDeg * PI / 180) result.add(p) startDeg++ } @@ -135,7 +141,7 @@ val result = mutableListOf<Pair<Double, Double>>() var startDeg = 0 while (startDeg <= 360) { - val p = MapUtil.getPointByLen(center, 50.0, startDeg * PI / 180) + val p = MapUtil.getPointByLen(center, DistanceType.TYPE1.disRange.second, startDeg * PI / 180) result.add(p) startDeg++ } -- Gitblit v1.9.3