From 9a9a27f185bc0cf9dc0001cfc6839e6d13dbccd9 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 08 五月 2025 17:38:30 +0800 Subject: [PATCH] 1. 添加了动态污染溯源相关功能逻辑 --- src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt index a8c9d8e..d2f3c57 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/ExceptionAnalysisController.kt @@ -1,7 +1,6 @@ package com.flightfeather.uav.biz.dataanalysis import com.flightfeather.uav.biz.FactorFilter -import com.flightfeather.uav.biz.dataanalysis.exceptiontype.ExceptionDataExceed import com.flightfeather.uav.biz.dataanalysis.exceptiontype.ExceptionSlideAverage import com.flightfeather.uav.biz.dataanalysis.exceptiontype.ExceptionValueMutation import com.flightfeather.uav.biz.dataanalysis.model.DataAnalysisConfig @@ -12,15 +11,12 @@ import com.flightfeather.uav.domain.repository.RealTimeDataRep import com.flightfeather.uav.domain.repository.SegmentInfoRep import com.flightfeather.uav.socket.eunm.UWDeviceType -import org.springframework.stereotype.Component import java.time.LocalDateTime import java.time.ZoneId -import java.time.format.DateTimeFormatter /** * 鏁版嵁寮傚父鍒嗘瀽鎺у埗鍣� */ -@Component class ExceptionAnalysisController( private val realTimeDataRep: RealTimeDataRep, private val locationRoadNearby: LocationRoadNearby, @@ -34,13 +30,13 @@ private fun initTask(config: DataAnalysisConfig) { taskList.clear() taskList.apply { - add(ExceptionDataExceed(config)) +// add(ExceptionDataExceed(config)) add(ExceptionValueMutation(config)) add(ExceptionSlideAverage(config)) } } - fun run(mission: Mission, factorFilter: FactorFilter): List<ExceptionResult> { + fun execute(mission: Mission, factorFilter: FactorFilter): List<ExceptionResult> { running = true val config = DataAnalysisConfig(mission, ExceptionSetting(), factorFilter) initTask(config) @@ -63,7 +59,9 @@ // 鏌ヨ寮傚父鍛ㄨ竟鍙兘姹℃煋婧� nearBy(r, config) // 鏌ヨ鏃舵鎵�鍦ㄨ矾娈� - road(r) +// road(r) + // 灏嗘暟鎹浆鎹负閫氱敤鏍煎紡 + r.dataVoList = r.dataList.map { e-> e.toDataVo() } } // 瀛樺偍鍒嗘瀽缁撴灉 result.addAll(it.resultList) @@ -71,6 +69,8 @@ running = false return result } + +// private fun private fun nearBy(r: ExceptionResult, config: DataAnalysisConfig) { if (r.longitude != null && r.latitude != null) { @@ -85,6 +85,7 @@ } r.relatedSceneId = idList r.relatedSceneName = nameList + r.relatedSceneList = sceneList } } } -- Gitblit v1.9.3