From cc2a28ad6b99795d05cd9c923d8f7da27b4509e3 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 04 六月 2025 17:31:41 +0800
Subject: [PATCH] 1. 新增动态污染溯源新的判定逻辑（待完成）
---
src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt
index 62bbcf6..e898e97 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt
@@ -6,12 +6,14 @@
import com.flightfeather.uav.biz.dataprocess.PreData
import com.flightfeather.uav.common.chart.DataToChartUtil
import com.flightfeather.uav.common.exception.BizException
+import com.flightfeather.uav.common.location.LocationRoadNearby
import com.flightfeather.uav.common.pdf.GeneratePdfUtil
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.common.utils.ImageUtil
import com.flightfeather.uav.domain.entity.Mission
import com.flightfeather.uav.domain.repository.MissionRep
import com.flightfeather.uav.domain.repository.RealTimeDataRep
+import com.flightfeather.uav.domain.repository.SegmentInfoRep
import org.springframework.beans.BeanUtils
import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Component
@@ -24,12 +26,17 @@
*/
@Component
class MissionReport(
- private val exceptionAnalysisController: ExceptionAnalysisController,
private val missionRep: MissionRep,
private val realTimeDataRep: RealTimeDataRep,
+ private val locationRoadNearby: LocationRoadNearby,
+ private val segmentInfoRep: SegmentInfoRep,
@Value("\${filePath}")
private val filePath: String,
) {
+
+ private val exceptionAnalysisController =
+ ExceptionAnalysisController(realTimeDataRep, locationRoadNearby, segmentInfoRep)
+
data class Param(
val district: String,
val town: String,
@@ -105,7 +112,7 @@
// 鑾峰彇寮傚父鍒嗘瀽缁撴灉
fun exceptionAnalysis(mission: Mission, factorFilter: FactorFilter): List<ExceptionResult> {
- return exceptionAnalysisController.run(mission, factorFilter)
+ return exceptionAnalysisController.execute(mission, factorFilter)
}
// 璁＄畻鍧囧�煎拰鏁版嵁鑼冨洿
@@ -149,12 +156,12 @@
// 4. 鐢熸垚鎶ュ憡
val fileName = "report/" + "${mission.districtName}璧拌埅鐩戞祴鎶ュ憡-${
DateUtil.instance.dateToString(mission.startTime, DateUtil.DateStyle.YYYY_MM_DD)
- }.doc"
+ }(${mission.missionCode}).doc"
val reportTemplate = ReportTemplate(templateName, filePath, fileName)
val param = getParam(mission, exceptions, summaries)
val params = reportTemplate.getParam(param)
GeneratePdfUtil.generateWord(params)
- return fileName
+ return filePath + fileName
}
private fun getParam(mission: Mission, exceptions: List<ExceptionResult>, summaries: List<Summary>): Param {
--
Gitblit v1.9.3