From 2de612e9b260df2e76d4dd620ca739aa3b6e8c57 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期一, 25 八月 2025 16:07:16 +0800 Subject: [PATCH] 2025.8.25 1. 添加走航季度报告相关统计功能(待完成) --- src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt index 81aef67..d2b696f 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt @@ -28,7 +28,12 @@ * 姣忎竴鍒婚挓瀵瑰巻鍙茬嚎绱㈣繘琛岀粺璁★紝鎻愬嚭浼氬晢寤鸿锛堢姹℃煋婧愯緝杩溿�佹薄鏌撴簮鏁伴噺銆佸嚭鐜版鏁帮級銆佽蛋鑸矾绾胯皟鏁村缓璁紙绂绘薄鏌撴簮杈冭繎銆佽蛋鑸建杩规湭鎺ヨ繎婧簮鍦烘櫙锛� */ - constructor(sceneInfoRep: SceneInfoRep, sourceTraceRep: SourceTraceRep, factorFilter: FactorFilter?) { + constructor( + sceneInfoRep: SceneInfoRep, + sourceTraceRep: SourceTraceRep, + factorFilter: FactorFilter?, + isSearchAddress: Boolean, + ) { this.sceneInfoRep = sceneInfoRep this.sourceTraceRep = sourceTraceRep this.config = if (factorFilter != null) { @@ -43,7 +48,7 @@ .withMain(FactorType.O3) .withMain(FactorType.PM25) .withMain(FactorType.PM10) -// .withMain(FactorType.VOC) + .withMain(FactorType.VOC) .withCombination( listOf( listOf(FactorType.PM25, FactorType.PM10), @@ -53,11 +58,14 @@ .create() ) } + this.config.isSearchAddress = isSearchAddress + pollutedSummary = PollutedSummary(config) { summaryCallback(it) } newTask() } - constructor(sceneInfoRep: SceneInfoRep, sourceTraceRep: SourceTraceRep) : this(sceneInfoRep, sourceTraceRep, null) + constructor(sceneInfoRep: SceneInfoRep, sourceTraceRep: SourceTraceRep, isSearchAddress: Boolean = true) + : this(sceneInfoRep, sourceTraceRep, null, isSearchAddress) private val pollutedSummary: PollutedSummary private val sceneInfoRep: SceneInfoRep @@ -76,6 +84,7 @@ private fun newTask() { taskList.apply { +// add(RTExcSlideAverage(config) { dataChangeCallback(it) }.also { it.init() }) add(RTExcWindLevel1(config) { exceptionCallback(it) }.also { it.init() }) add(RTExcWindLevel1_1(config) { exceptionCallback(it) }.also { it.init() }) add(RTExcWindLevel4(config) { exceptionCallback(it) }.also { it.init() }) -- Gitblit v1.9.3