From 707b00a0ca6604c249a110b376ac1e44e408e624 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 04 九月 2025 18:24:39 +0800 Subject: [PATCH] 2025.9.4 1. 新增走航任务统计功能(待完成) --- src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt index bb440bf..5bd59a6 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt @@ -1,15 +1,20 @@ package com.flightfeather.uav.lightshare.service import com.flightfeather.uav.biz.dataanalysis.model.ExceptionResult +import com.flightfeather.uav.biz.report.MissionGridFusion import com.flightfeather.uav.biz.report.MissionInventory import com.flightfeather.uav.biz.report.MissionInventory.MissionDetail import com.flightfeather.uav.biz.report.MissionRiskArea import com.flightfeather.uav.biz.report.MissionSummary import com.flightfeather.uav.biz.sourcetrace.model.PollutedClue import com.flightfeather.uav.domain.entity.BaseRealTimeData +import com.flightfeather.uav.domain.entity.GridCell import com.flightfeather.uav.domain.entity.Mission import com.flightfeather.uav.domain.entity.SceneInfo import com.flightfeather.uav.lightshare.bean.AreaVo +import com.flightfeather.uav.lightshare.bean.GridDataDetailMixVo +import com.flightfeather.uav.lightshare.eunm.PollutionDegree +import com.flightfeather.uav.socket.eunm.FactorType import java.util.* /** @@ -87,4 +92,14 @@ fun generateClueByRiskArea(startTime: Date, endTime: Date, areaVo: AreaVo): List<MissionRiskArea.ClueByArea> fun generateClueByRiskArea(keyScenes: List<SceneInfo?>, pollutedClues: List<PollutedClue?>): List<MissionRiskArea.ClueByArea> + + fun generateGridFusion(factorTypes: List<FactorType>, startTime: Date, endTime: Date, areaVo: AreaVo): + List<MissionGridFusion.GridFusionByAQI> + + fun generateGridFusion( + factorTypes: List<FactorType>, + gridLen: Int, + gridCells: List<GridCell>, + dataList: List<Triple<PollutionDegree, List<MissionInventory.MissionDetail>, List<GridDataDetailMixVo>>>, + ): List<MissionGridFusion.GridFusionByAQI> } \ No newline at end of file -- Gitblit v1.9.3