From 0bfd1f3b422677ddfed45f13fc034f17f049b9d5 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 03 六月 2025 17:30:35 +0800
Subject: [PATCH] 1. 新增动态污染溯源新的判定逻辑（待完成）
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 6f7fd3c..2d0a968 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
@@ -24,7 +24,7 @@
config: RTExcWindLevelConfig,
windLevelCondition: RTExcWindLevelConfig.WindLevelCondition,
) : this() {
- distanceType = windLevelCondition.mutationRate.second
+ distanceType = windLevelCondition.distanceType
sourceTrace(exceptionData, config, windLevelCondition)
}
@@ -55,13 +55,16 @@
polygon = calSector(
avgData.windSpeed!!.toDouble(),
pair,
- windLevelCondition.mutationRate.second.disRange,
+ windLevelCondition.distanceType.disRange,
config.sourceTraceDegOffset
- )
+ ).map {
+ // 灏嗗潗鏍囪浆鎹负gcj02锛堢伀鏄熷潗鏍囩郴锛夛紝鍥犱负姹℃煋婧愬満鏅俊鎭兘涓烘鍧愭爣绯�
+ MapUtil.wgs84ToGcj02(it)
+ }
try {
val address = AMapService.reGeo(pair)
- this.address = address.township + address.street
+ this.address = address.district + address.township + address.street
} catch (e: Exception) {
e.printStackTrace()
}
--
Gitblit v1.9.3