From 7d33080998a2c5b38e8a74dbed2b0f40d39bbe47 Mon Sep 17 00:00:00 2001 From: Riku <risaku@163.com> Date: 星期三, 04 六月 2025 23:27:26 +0800 Subject: [PATCH] 1. 新增动态污染溯源新的判定逻辑(待完成) --- src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSummary.kt | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 12 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 6ec9d46..5b3c06a 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 @@ -1,9 +1,13 @@ package com.flightfeather.uav.biz.sourcetrace.model import com.flightfeather.uav.biz.sourcetrace.config.RTExcWindLevelConfig +import com.flightfeather.uav.common.net.AMapService +import com.flightfeather.uav.common.utils.MapUtil import com.flightfeather.uav.domain.entity.BaseRealTimeData import com.flightfeather.uav.domain.entity.SceneInfo +import java.math.BigDecimal import java.time.LocalDateTime +import java.util.Date import java.util.Timer import java.util.TimerTask @@ -30,6 +34,9 @@ inner class AnalysisResult{ // 鎸夌収琚壂鎻忔鏁伴檷搴忔帓鍒楃殑姹℃煋婧愬垪琛� var sortedSceneList: List<Pair<SceneInfo?, Int>>? = null + var time: Date? = null + var advice:String?= null + var direction: AMapService.AMapDirection? = null } /** @@ -53,16 +60,7 @@ private var analysisTimer: Timer? = null // 瀹氭椂姹℃煋鍒嗘瀽浠诲姟 - private val analysisOnTimeTask = object : TimerTask() { - override fun run() { - // 璁板綍浠诲姟杩愯鐘舵�� - analysisTaskIsRunning = true - analysis() - // 璁板綍涓婁竴娆$殑浠诲姟缁撴潫鏃堕棿 - lastAnalysisTime = LocalDateTime.now() - analysisTaskIsRunning = false - } - } + private var lastAnalysisOnTimeTask:TimerTask? = null // 瀹氭椂姹℃煋鍒嗘瀽浠诲姟杩愯鐘舵�� private var analysisTaskIsRunning = false @@ -104,10 +102,12 @@ private fun resetAnalysisOnTime() { // 鍙栨秷鍘熸湁鐨勫垎鏋愪换鍔¤鏃� analysisTimer?.cancel() + lastAnalysisOnTimeTask?.cancel() // 浠ュ綋鍓嶆椂闂翠负璧风偣锛岄噸鏂板紑濮嬫柊鐨勪竴杞瓑寰呰鏃� analysisTimer = Timer() val period = config.analysisPeriod * 60 * 1000L - analysisTimer?.schedule(analysisOnTimeTask, period, period) + lastAnalysisOnTimeTask = newAnalysisTask() + analysisTimer?.schedule(lastAnalysisOnTimeTask, period, period) } /** @@ -116,7 +116,7 @@ */ private fun analysisOnClueCount() { if (clueList.size >= config.analysisCount && !analysisTaskIsRunning) { - analysisOnTimeTask.run() + newAnalysisTask().run() resetAnalysisOnTime() } } @@ -161,8 +161,27 @@ result.sortedSceneList = res.map { it.value } // 褰撳墠鐨勮蛋鑸暟鎹殑瀹氫綅鍜屾薄鏌撴簮璺濈鏄惁鏄�愭笎鎺ヨ繎锛岃嫢璧拌埅杩滅浜嗕富瑕佹薄鏌撴簮锛屾彁绀虹敤鎴疯皟鏁磋蛋鑸矾绾� + if (!result.sortedSceneList.isNullOrEmpty()) { + val sT = clueList.first().pollutedData?.startTime + val closetScene = result.sortedSceneList?.first() + result.advice = "鏍规嵁${sT}璧风殑${clueList.size}鏉℃渶鏂版薄鏌撶嚎绱紝姹℃煋婧怺${closetScene?.first?.name}]琚娆℃函婧愶紝鍏锋湁杈冮珮姹℃煋椋庨櫓锛岀幇鎻愪緵鏂扮殑璧拌埅鎺ㄨ崘璺嚎锛屽彲缁忚繃璇ユ薄鏌撴簮銆�" + val lastP = realTimeDataList.last() + 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) { + + 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) + } + } + + + result.time = realTimeDataList.last().dataTime // 绾跨储鍒嗘瀽瀹屾垚鍚庯紝绉诲姩鑷冲巻鍙茬嚎绱㈠垪琛� historyClueList.addAll(clueList) clueList.clear() @@ -172,4 +191,18 @@ // TODO() } + // 瀹氭椂姹℃煋鍒嗘瀽浠诲姟 + private fun newAnalysisTask(): TimerTask { + return object : TimerTask() { + override fun run() { + // 璁板綍浠诲姟杩愯鐘舵�� + analysisTaskIsRunning = true + analysis() + // 璁板綍涓婁竴娆$殑浠诲姟缁撴潫鏃堕棿 + lastAnalysisTime = LocalDateTime.now() + analysisTaskIsRunning = false + } + } + } + } \ No newline at end of file -- Gitblit v1.9.3