From 594de76ed51fd49fb79b912212bb0052a63e7671 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 09 四月 2026 16:10:45 +0800
Subject: [PATCH] 2026.4.9
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 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 161c7b7..80a6e19 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/DataAnalysisService.kt
@@ -12,6 +12,7 @@
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.DataHead
import com.flightfeather.uav.lightshare.bean.GridDataDetailMixVo
import com.flightfeather.uav.lightshare.eunm.PollutionDegree
import com.flightfeather.uav.socket.eunm.FactorType
@@ -32,15 +33,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?, page: Int?, perPage: Int?): Pair<DataHead, String>
/**
* 鐢熸垚璧拌埅浠诲姟姹囨�荤粺璁�
@@ -50,9 +53,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 +70,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,7 +96,12 @@
* @param areaVo 鍖哄煙鍙傛暟
* @return 浠诲姟璇︽儏鍒楄〃锛屾瘡涓厓绱犲寘鍚换鍔″畬鏁翠俊鎭�佸満鏅暟鎹拰缁熻缁撴灉
*/
- fun generateMissionDetail(startTime: Date, endTime: Date, areaVo: AreaVo,granularity: String?): List<MissionDetail>
+ fun generateMissionDetail(
+ startTime: Date, endTime: Date, areaVo: AreaVo, granularity: String?,
+ removeOtherDistrict: Boolean = false,
+ removeNoPollutedSource: Boolean = false,
+ minPer: Double? = 0.5,
+ ): List<MissionDetail>
/**
* 鐢熸垚璧拌埅浠诲姟璇︽儏锛堟寜浠诲姟缂栧彿绛涢�夛級
@@ -94,7 +110,9 @@
* @param granularity 鏁版嵁棰楃矑搴︼紝鍙�夊�间负SECOND, MINUTE, HOUR, 榛樿MINUTE
* @return 浠诲姟璇︽儏瀵硅薄锛屽寘鍚换鍔″畬鏁翠俊鎭�佸満鏅暟鎹拰缁熻缁撴灉
*/
- fun generateMissionDetail(missionCode: String, granularity: String?): MissionDetail
+ fun generateMissionDetail(
+ missionCode: String, granularity: String?, minPer: Double? = 0.5,
+ ): MissionDetail
/**
* 鑾峰彇璧拌埅浠诲姟璇︽儏锛堢洿鎺ュ鐞嗕换鍔℃暟鎹級
@@ -114,16 +132,24 @@
startTime: Date,
endTime: Date,
areaVo: AreaVo,
- removeOtherDistrict: Boolean,
- removeNoPollutedSource: Boolean,
- ): List<MissionRiskArea.ClueByArea>
+ 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