From a5d3f60ae4aa27744b47fcc3107be8005c3da910 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 02 十二月 2021 14:23:50 +0800
Subject: [PATCH] 1. 新增用电量日分析功能
---
src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt b/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt
index 316fe93..8c93f62 100644
--- a/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt
@@ -2,35 +2,35 @@
/**
* 鍧囧�艰绠楀伐鍏凤紝灏嗕竴缁勮繛缁暟鎹浆鎹负鑷畾涔夊懆鏈熺殑鍧囧�兼暟鎹�
- * 瑕佹眰浼犲叆鐨勬暟鎹寜鐓ф椂闂撮『搴忔帓鍒楋紝
+ * 瑕佹眰浼犲叆鐨勬暟鎹寜鐓ф椂闂撮『搴忔搴忔帓鍒楋紝
* @param onTag 瀹氫箟鏁版嵁鏍囩鑾峰彇鍥炶皟鍑芥暟锛屽綋褰撳墠鏁版嵁鏍囩涓庝笂涓暟鎹爣绛句笉鍚屾椂锛屽嵆璁や负涓婁竴缁勬暟鎹负鍚屼竴缁勬暟鎹紝闇�姹傚嚭鍧囧��
* @param onAvg 瀹氫箟鍧囧�艰绠楁柟娉�
*/
-class AverageUtil<T : Any>(var onTag: (d: T) -> String, var onAvg: (list: List<T>) -> T) {
+class AverageUtil<T, K>(var onTag: (d: T) -> String, var onAvg: (list: List<T>) -> K) {
// 缂撳瓨鏈�鏂扮殑tag
private var lastTag: String? = null
// 涓存椂鏁版嵁缂撳瓨
private val dataSet = mutableListOf<T>()
// 杞崲缁撴灉
- private val result = mutableListOf<T>()
+ private val result = mutableListOf<K>()
/**
* 灏嗘暟鎹泦杞崲涓哄潎鍊兼暟鎹�
* @param list 鍘熷鏁版嵁
* @return 鍧囧�兼暟鎹�
*/
- fun avg(list: List<T>): List<T> {
+ fun avg(list: List<T>): List<K> {
// 鍒濆鍖栨墍鏈夊彉閲�
clear()
// 璁＄畻鍧囧��
list.forEach {
val tag = onTag(it)
- // 绗竴鏉℃暟鎹拰tag鐩稿悓鏃讹紝灏嗘暟鎹斁鍏ヤ复鏃剁紦瀛樺垪琛�
+ // 鏄涓�鏉℃暟鎹垨tag鐩稿悓鏃讹紝灏嗘暟鎹斁鍏ヤ复鏃剁紦瀛樺垪琛�
if (lastTag == null || tag == lastTag) {
dataSet.add(it)
}
- // 褰搕ag涓嶅悓鏃讹紝璁＄畻涔嬪墠鏁版嵁鐨勫潎鍊硷紝鍚屾椂鎯呭喌涓存椂鏁版嵁缂撳瓨锛屾坊鍔犲綋鍓嶇殑鏂版暟鎹�
+ // 褰搕ag涓嶅悓鏃讹紝璁＄畻涔嬪墠鏁版嵁鐨勫潎鍊硷紝鍚屾椂娓呯┖涓存椂鏁版嵁缂撳瓨锛屾坊鍔犲綋鍓嶇殑鏂版暟鎹�
else {
result.add(onAvg(dataSet))
dataSet.clear()
--
Gitblit v1.9.3