From 9c797fa0d704ef8ffb65cd1716b8eb694b4c46c3 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 04 七月 2025 17:28:00 +0800
Subject: [PATCH] 2025.7.4 1. 新增动态污染溯源新的判定逻辑
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSummary.kt | 59 +++++++++++++++++++++++++++--------------------------------
1 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSummary.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSummary.kt
index 5b3c06a..cbd6721 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSummary.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSummary.kt
@@ -2,6 +2,7 @@
import com.flightfeather.uav.biz.sourcetrace.config.RTExcWindLevelConfig
import com.flightfeather.uav.common.net.AMapService
+import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.common.utils.MapUtil
import com.flightfeather.uav.domain.entity.BaseRealTimeData
import com.flightfeather.uav.domain.entity.SceneInfo
@@ -12,7 +13,7 @@
import java.util.TimerTask
// 寮傚父鏁版嵁鐢熸垚鍥炶皟绫�
-typealias NewPolluteSummaryCallback = (ex: PollutedSummary.AnalysisResult) -> Unit
+typealias NewPolluteSummaryCallback = (ex: AnalysisResult) -> Unit
/**
* 姹℃煋鎯呭喌姹囨��
@@ -27,17 +28,6 @@
* 5. 姹℃煋婧愮殑琚壂鎻忔鏁�
* 姣忎竴鍒婚挓瀵瑰巻鍙茬嚎绱㈣繘琛岀粺璁★紝鎻愬嚭浼氬晢寤鸿锛堢姹℃煋婧愯緝杩溿�佹薄鏌撴簮鏁伴噺銆佸嚭鐜版鏁帮級銆佽蛋鑸矾绾胯皟鏁村缓璁紙绂绘薄鏌撴簮杈冭繎銆佽蛋鑸建杩规湭鎺ヨ繎婧簮鍦烘櫙锛�
*/
-
- /**
- * 鍒嗘瀽缁撴灉
- */
- inner class AnalysisResult{
- // 鎸夌収琚壂鎻忔鏁伴檷搴忔帓鍒楃殑姹℃煋婧愬垪琛�
- var sortedSceneList: List<Pair<SceneInfo?, Int>>? = null
- var time: Date? = null
- var advice:String?= null
- var direction: AMapService.AMapDirection? = null
- }
/**
* 瀹炴椂缁熻
@@ -60,7 +50,7 @@
private var analysisTimer: Timer? = null
// 瀹氭椂姹℃煋鍒嗘瀽浠诲姟
- private var lastAnalysisOnTimeTask:TimerTask? = null
+ private var lastAnalysisOnTimeTask: TimerTask? = null
// 瀹氭椂姹℃煋鍒嗘瀽浠诲姟杩愯鐘舵��
private var analysisTaskIsRunning = false
@@ -128,8 +118,8 @@
val statistic = AnalysisStatistic()
// 鍏辨湁澶氬皯鐩稿叧姹℃煋婧愶紝鍝簺姹℃煋婧愯鎵弿娆℃暟杈冨
val sceneMap = mutableMapOf<String?, Pair<SceneInfo?, Int>>()
- clueList.forEach {c->
- c.pollutedSource?.sceneList?.forEach { s->
+ clueList.forEach { c ->
+ c.pollutedSource?.sceneList?.forEach { s ->
if (!sceneMap.containsKey(s?.guid)) {
sceneMap[s?.guid] = s to 1
} else {
@@ -145,11 +135,12 @@
* 绾跨储鍒嗘瀽
*/
private fun analysis() {
- val result = AnalysisResult()
+ if (clueList.isEmpty()) return
+ val result = AnalysisResult().apply { deviceCode = clueList.first().deviceCode }
// 鍏辨湁澶氬皯鐩稿叧姹℃煋婧愶紝鍝簺姹℃煋婧愯鎵弿娆℃暟杈冨
val sceneMap = mutableMapOf<String?, Pair<SceneInfo?, Int>>()
- clueList.forEach {c->
- c.pollutedSource?.sceneList?.forEach { s->
+ clueList.forEach { c ->
+ c.pollutedSource?.sceneList?.forEach { s ->
if (!sceneMap.containsKey(s?.guid)) {
sceneMap[s?.guid] = s to 1
} else {
@@ -157,37 +148,41 @@
}
}
}
- val res = sceneMap.entries.sortedBy { it.value.second }
+ val res = sceneMap.entries.sortedByDescending { it.value.second }
result.sortedSceneList = res.map { it.value }
// 褰撳墠鐨勮蛋鑸暟鎹殑瀹氫綅鍜屾薄鏌撴簮璺濈鏄惁鏄�愭笎鎺ヨ繎锛岃嫢璧拌埅杩滅浜嗕富瑕佹薄鏌撴簮锛屾彁绀虹敤鎴疯皟鏁磋蛋鑸矾绾�
if (!result.sortedSceneList.isNullOrEmpty()) {
- val sT = clueList.first().pollutedData?.startTime
+ val sT = DateUtil.instance.dateToString(clueList.first().pollutedData?.startTime, DateUtil.DateStyle.HH_MM_SS)
+ val eT = DateUtil.instance.dateToString(clueList.last().pollutedData?.endTime, DateUtil.DateStyle.HH_MM_SS)
val closetScene = result.sortedSceneList?.first()
- result.advice = "鏍规嵁${sT}璧风殑${clueList.size}鏉℃渶鏂版薄鏌撶嚎绱紝姹℃煋婧怺${closetScene?.first?.name}]琚娆℃函婧愶紝鍏锋湁杈冮珮姹℃煋椋庨櫓锛岀幇鎻愪緵鏂扮殑璧拌埅鎺ㄨ崘璺嚎锛屽彲缁忚繃璇ユ薄鏌撴簮銆�"
-
+ // 璧拌埅璺嚎璋冩暣寤鸿
+ result.advice =
+ "鏍规嵁${sT}鑷�${eT}鐨�${clueList.size}鏉℃函婧愬垏鐗囷紝椋庨櫓婧愩��" +
+ "${closetScene?.first?.name}銆戣澶氭婧簮锛屽叿鏈夎緝楂樻薄鏌撻闄╋紝鐜版彁渚涙柊鐨勮蛋鑸帹鑽愯矾绾匡紝鍙粡杩囪姹℃煋婧愩��"
val lastP = realTimeDataList.last()
+ // 寤鸿瀵瑰簲鐨勬暟鎹噰鏍锋椂闂�
+ result.time = lastP.dataTime
if (lastP.longitude != null && lastP.latitude != null &&
lastP.longitude!! > BigDecimal.ZERO && lastP.latitude!! > BigDecimal.ZERO
&& closetScene?.first?.longitude != null && closetScene.first?.latitude != null &&
- closetScene.first?.longitude!! > BigDecimal.ZERO && closetScene.first?.latitude!! > BigDecimal.ZERO) {
+ closetScene.first?.longitude!! > BigDecimal.ZERO && closetScene.first?.latitude!! > BigDecimal.ZERO
+ ) {
val origin = MapUtil.wgs84ToGcj02(lastP.longitude!!.toDouble() to lastP.latitude!!.toDouble())
val destination = closetScene.first!!.longitude.toDouble() to closetScene.first!!.latitude.toDouble()
+ // 寤鸿鐨勮蛋鑸矾绾�
result.direction = AMapService.directionDriving(origin, destination)
}
+ // 绾跨储鍒嗘瀽瀹屾垚鍚庯紝绉诲姩鑷冲巻鍙茬嚎绱㈠垪琛�
+ historyClueList.addAll(clueList)
+ clueList.clear()
+ realTimeDataList.clear()
+
+ callback(result)
}
-
-
- result.time = realTimeDataList.last().dataTime
- // 绾跨储鍒嗘瀽瀹屾垚鍚庯紝绉诲姩鑷冲巻鍙茬嚎绱㈠垪琛�
- historyClueList.addAll(clueList)
- clueList.clear()
- realTimeDataList.clear()
-
- callback(result)
// TODO()
}
--
Gitblit v1.9.3