From d649f734c44541641158aec2d6b10d630f5a0827 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 25 十二月 2025 17:25:16 +0800
Subject: [PATCH] 2025.12.19 1. 动态溯源相关分析逻辑调整； 2. 走航报告接口参数调整；
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 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 2c5081e..0587c85 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt
@@ -32,15 +32,17 @@
* @param missionCode 璧拌埅浠诲姟缂栧彿锛岀敤浜庡敮涓�鏍囪瘑鐗瑰畾鐨勮蛋鑸换鍔�
* @return 寮傚父缁撴灉鍒楄〃锛屾瘡涓厓绱犲寘鍚紓甯哥被鍨嬨�佷綅缃拰璇︾粏淇℃伅
*/
+ @Deprecated("璇ユ帴鍙ｅ凡搴熷純锛屼娇鐢�/report/missionSummary/one鎺ュ彛")
fun pollutionTrace(missionCode: String): List<ExceptionResult>
/**
* 鑾峰彇鍘嗗彶姹℃煋婧簮缁撴灉
* 鏍规嵁浠诲姟缂栧彿鏌ヨ骞惰繑鍥炲巻鍙叉薄鏌撴函婧愮粨鏋�
* @param missionCode 璧拌埅浠诲姟缂栧彿
+ * @param minPer 鏈�灏忔薄鏌撶櫨鍒嗘瘮锛岀敤浜庣瓫閫夊紓甯告暟鎹偣锛堝彲閫夛級
* @return 鍘嗗彶姹℃煋婧簮缁撴灉鐨勫瓧绗︿覆琛ㄧず锛堝叿浣撴牸寮忛渶鍙傝�冨疄鐜扮被锛�
*/
- fun fetchHistory(missionCode: String): String
+ fun fetchHistory(missionCode: String, minPer: Double?): String
/**
* 鐢熸垚璧拌埅浠诲姟姹囨�荤粺璁�
@@ -50,9 +52,14 @@
* @param areaVo 鍖哄煙鍙傛暟锛屽寘鍚粡绾害鑼冨洿绛夊湴鐞嗕俊鎭�
* @return 姹囨�荤粺璁″璞★紝鍖呭惈浠诲姟鎬绘暟銆佸紓甯哥巼銆佸钩鍧囨暟鎹瓑鎸囨爣
*/
- fun generateMissionSummary(startTime: Date, endTime: Date, areaVo: AreaVo): MissionSummary.Summary
+ fun generateMissionSummary(
+ startTime: Date, endTime: Date, areaVo: AreaVo, removeOtherDistrict: Boolean = false,
+ removeNoPollutedSource: Boolean = false, minPer: Double? = 0.5,
+ ): MissionSummary.Summary
- fun generateMissionSummary(missionCode: String): MissionSummary.Summary
+ fun generateMissionSummary(
+ missionCode: String, minPer: Double? = 0.5,
+ ): MissionSummary.Summary
/**
* 鐢熸垚璧拌埅浠诲姟娓呭崟锛堟寜鏃堕棿鍜屽尯鍩熺瓫閫夛級
@@ -62,7 +69,10 @@
* @param areaVo 鍖哄煙鍙傛暟
* @return 璧拌埅浠诲姟淇℃伅鍒楄〃锛屾瘡涓厓绱犲寘鍚换鍔″熀鏈俊鎭拰缁熻鏁版嵁
*/
- fun generateMissionList(startTime: Date, endTime: Date, areaVo: AreaVo): List<MissionInventory.MissionInfo>
+ fun generateMissionList(
+ startTime: Date, endTime: Date, areaVo: AreaVo, removeOtherDistrict: Boolean = false,
+ removeNoPollutedSource: Boolean = false, minPer: Double? = 0.5,
+ ): List<MissionInventory.MissionInfo>
/**
* 鐢熸垚璧拌埅浠诲姟娓呭崟锛堢洿鎺ュ鐞嗕换鍔＄嚎绱級
@@ -85,33 +95,60 @@
* @param areaVo 鍖哄煙鍙傛暟
* @return 浠诲姟璇︽儏鍒楄〃锛屾瘡涓厓绱犲寘鍚换鍔″畬鏁翠俊鎭�佸満鏅暟鎹拰缁熻缁撴灉
*/
- fun generateMissionDetail(startTime: Date, endTime: Date, areaVo: AreaVo): List<MissionDetail>
+ fun generateMissionDetail(
+ startTime: Date, endTime: Date, areaVo: AreaVo, granularity: String?,
+ removeOtherDistrict: Boolean = false,
+ removeNoPollutedSource: Boolean = false,
+ minPer: Double? = 0.5,
+ ): List<MissionDetail>
/**
* 鐢熸垚璧拌埅浠诲姟璇︽儏锛堟寜浠诲姟缂栧彿绛涢�夛級
* 鏍规嵁浠诲姟缂栧彿鏌ヨ骞剁敓鎴愯缁嗙殑浠诲姟鎶ュ憡锛屽寘鍚换鍔″畬鏁翠俊鎭�佸満鏅暟鎹拰缁熻缁撴灉
* @param missionCode 浠诲姟缂栧彿锛岀敤浜庡敮涓�鏍囪瘑鐗瑰畾鐨勮蛋鑸换鍔�
+ * @param granularity 鏁版嵁棰楃矑搴︼紝鍙�夊�间负SECOND, MINUTE, HOUR, 榛樿MINUTE
* @return 浠诲姟璇︽儏瀵硅薄锛屽寘鍚换鍔″畬鏁翠俊鎭�佸満鏅暟鎹拰缁熻缁撴灉
*/
- fun generateMissionDetail(missionCode: String): MissionDetail
+ fun generateMissionDetail(
+ missionCode: String, granularity: String?, minPer: Double? = 0.5,
+ ): MissionDetail
/**
* 鑾峰彇璧拌埅浠诲姟璇︽儏锛堢洿鎺ュ鐞嗕换鍔℃暟鎹級
* 澶勭悊宸叉湁鐨勪换鍔°�佹薄鏌撶嚎绱㈠拰瀹炴椂鏁版嵁锛岀敓鎴愯缁嗕换鍔℃姤鍛�
* @param keyScenes 鍏抽敭鍦烘櫙鍒楄〃锛岀敤浜庡垎鏋愯蛋鑸槸鍚︾粡杩囪鍖哄煙
* @param missionCluesData 鍖呭惈浠诲姟銆佹薄鏌撶嚎绱㈠拰瀹炴椂鏁版嵁鐨凾riple鍒楄〃
+ * @param granularity 鏁版嵁棰楃矑搴︼紝鍙�夊�间负SECOND, MINUTE, HOUR, 榛樿MINUTE
* @return 浠诲姟璇︽儏鍒楄〃
*/
- fun generateMissionDetail(keyScenes: List<SceneInfo?>, missionCluesData: List<Triple<Mission, List<PollutedClue?>, List<BaseRealTimeData>>>): List<MissionDetail>
+ fun generateMissionDetail(
+ keyScenes: List<SceneInfo?>,
+ missionCluesData: List<Triple<Mission, List<PollutedClue?>, List<BaseRealTimeData>>>,
+ granularity: String,
+ ): List<MissionDetail>
- fun generateClueByRiskArea(startTime: Date, endTime: Date, areaVo: AreaVo): List<MissionRiskArea.ClueByArea>
+ fun generateClueByRiskArea(
+ startTime: Date,
+ endTime: Date,
+ areaVo: AreaVo,
+ removeOtherDistrict: Boolean = false,
+ removeNoPollutedSource: Boolean = false,
+ minPer: Double? = 0.5,
+ ): List<MissionRiskArea.ClassifyClue>
- fun generateClueByRiskArea(missionCode: String): List<MissionRiskArea.ClueByArea>
+ fun generateClueByRiskArea(missionCode: String, minPer: Double? = 0.5): 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>,
+ startTime: Date,
+ endTime: Date,
+ areaVo: AreaVo,
+ removeOtherDistrict: Boolean = false,
+ removeNoPollutedSource: Boolean = false,
+ minPer: Double? = 0.5,
+ ): List<MissionGridFusion.GridFusionByAQI>
fun generateGridFusion(
factorTypes: List<FactorType>,
--
Gitblit v1.9.3