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/mission/MissionUtil.kt |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/biz/mission/MissionUtil.kt b/src/main/kotlin/com/flightfeather/uav/biz/mission/MissionUtil.kt
index be6523c..2b49150 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/mission/MissionUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/mission/MissionUtil.kt
@@ -56,4 +56,37 @@
         // 杩斿洖涔¢晣鍜岃閬撳悕绉扮粍鍚�
         return address.township
     }
+
+    /**
+     * 鏁版嵁娓呮礂
+     * 1. 淇鐢变簬纭欢璁惧鍗¢】瀵艰嚧鐨勬暟鎹噰鏍锋椂闂翠笉鍙橀棶棰橈紝閲囩敤鑷姩绱姞鏁版嵁鍛ㄦ湡鐨勬柟寮忎慨鏀归噰鏍锋椂闂�
+     * @param data 鍘熷鏁版嵁鍒楄〃
+     * @param period 鏁版嵁鍛ㄦ湡锛屽崟浣嶏細绉�
+     * @return 娓呮礂鍚庨渶瑕佷慨鏀圭殑鏁版嵁鍒楄〃
+     */
+    fun dataClean(dataList: List<BaseRealTimeData>, period: Long): List<BaseRealTimeData> {
+        val cleanedData = mutableListOf<BaseRealTimeData>()
+        var errorData: BaseRealTimeData? = null
+        dataList.forEachIndexed { index, data ->
+            if (index == 0) {
+                return@forEachIndexed
+            }
+            val lastOne = dataList[index - 1]
+            if (errorData == null) {
+                if (data.dataTime!!.time == lastOne.dataTime!!.time) {
+                    data.dataTime?.time = lastOne.dataTime?.time!!.plus(period * 1000)
+                    cleanedData.add(data)
+                    errorData = lastOne
+                }
+            } else {
+                if (data.dataTime!!.time == errorData!!.dataTime!!.time) {
+                    data.dataTime?.time = lastOne.dataTime?.time!!.plus(period * 1000)
+                    cleanedData.add(data)
+                } else {
+                    errorData = null
+                }
+            }
+        }
+        return cleanedData
+    }
 }

--
Gitblit v1.9.3