From 538ba7a3bbc682f4537f1dd34f93feb2cf56b08e Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 14 十月 2025 17:32:04 +0800
Subject: [PATCH] 2025.10.14 1. 新增数据统计颗粒度选项，可选秒级数据、分钟数据进行数据统计 2. 典型隐患区域统计新增按照污染溯源区域进行分类统计的功能
---
src/main/kotlin/com/flightfeather/uav/biz/report/MissionInventory.kt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionInventory.kt b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionInventory.kt
index f6700d7..302871e 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionInventory.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionInventory.kt
@@ -19,7 +19,7 @@
// 璧拌埅娓呭崟淇℃伅
class MissionInfo : Mission() {
// 棣栬姹℃煋鐗�
- var mainFactor: String? = null
+// var mainFactor: String? = null
// 鐩戞祴寮傚父鍥犲瓙
var abnormalFactors: List<FactorType>? = null
@@ -74,7 +74,7 @@
val missionInfo = MissionInfo()
BeanUtils.copyProperties(mission, missionInfo)
missionInfo.apply {
- mainFactor = factorMap.maxByOrNull { it.value }?.key?.name
+// mainFactor = factorMap.maxByOrNull { it.value }?.key?.name
this.abnormalFactors = abnormalFactors
this.sceneCount = sceneCount
}
@@ -152,7 +152,7 @@
val missionInfo = MissionInfo()
BeanUtils.copyProperties(mission, missionInfo)
missionInfo.apply {
- mainFactor = factorMap.maxByOrNull { it.value }?.key?.name
+// mainFactor = factorMap.maxByOrNull { it.value }?.key?.name
this.abnormalFactors = abnormalFactors
this.sceneCount = sceneCount
this.scenes = scenes
@@ -182,6 +182,7 @@
mission: Mission,
pollutedClues: List<PollutedClue?>,
data: List<BaseRealTimeData>,
+ granularity: String,
minDis: Double = 100.0,
): MissionDetail {
// 鍒涘缓浠诲姟璇︽儏瀵硅薄骞跺鍒跺熀鏈俊鎭�
@@ -222,7 +223,7 @@
// missionDetail.keyScene = relatedScenes
// 璁＄畻鐜鍥犲瓙缁熻鏁版嵁锛堝钩鍧囧�笺�佹渶灏忓�笺�佹渶澶у�硷級
- missionDetail.dataStatistics = data.calDataStatistics()
+ missionDetail.dataStatistics = data.calDataStatistics(granularity)
// 寮傚父鏁版嵁鐐规暟閲忕粺璁�
// val clues = pollutedClues.filter { it?.msgType == MsgType.PolClue.value }
--
Gitblit v1.9.3