From 2e024c986c14943a41f7bfe913cfef0cede64198 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 29 七月 2025 17:37:54 +0800 Subject: [PATCH] 2025.7.29 1. 动态溯源模块添加记录删除等debug功能 --- src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 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 cd82f6c..e9092d6 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 /** * 鍙嶅悜婧簮 @@ -67,13 +72,19 @@ MapUtil.wgs84ToGcj02(it) } - closePolygon = closeSourceTrace(historyData, pair) + closePolygon = closeSourceTrace(historyData, pair).map { + // 灏嗗潗鏍囪浆鎹负gcj02锛堢伀鏄熷潗鏍囩郴锛夛紝鍥犱负姹℃煋婧愬満鏅俊鎭兘涓烘鍧愭爣绯� + MapUtil.wgs84ToGcj02(it) + } - try { - val address = AMapService.reGeo(pair) - this.address = address.district + address.township + address.street - } catch (e: Exception) { - e.printStackTrace() + if (config.isSearchAddress) { + try { + val address = AMapService.reGeo(MapUtil.wgs84ToGcj02(pair)) + this.address = address.district + address.township + address.street +// Thread.sleep(100) + } catch (e: Exception) { + e.printStackTrace() + } } } -- Gitblit v1.9.3