From e99f1cd836475a059ed6fdcbd4235416ba108dd1 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 03 十二月 2021 17:16:00 +0800 Subject: [PATCH] 1. 新增用电量日分析功能 --- src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt b/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt index 6cc7b95..8c93f62 100644 --- a/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt +++ b/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt @@ -2,7 +2,7 @@ /** * 鍧囧�艰绠楀伐鍏凤紝灏嗕竴缁勮繛缁暟鎹浆鎹负鑷畾涔夊懆鏈熺殑鍧囧�兼暟鎹� - * 瑕佹眰浼犲叆鐨勬暟鎹寜鐓ф椂闂撮『搴忔帓鍒楋紝 + * 瑕佹眰浼犲叆鐨勬暟鎹寜鐓ф椂闂撮『搴忔搴忔帓鍒楋紝 * @param onTag 瀹氫箟鏁版嵁鏍囩鑾峰彇鍥炶皟鍑芥暟锛屽綋褰撳墠鏁版嵁鏍囩涓庝笂涓暟鎹爣绛句笉鍚屾椂锛屽嵆璁や负涓婁竴缁勬暟鎹负鍚屼竴缁勬暟鎹紝闇�姹傚嚭鍧囧�� * @param onAvg 瀹氫箟鍧囧�艰绠楁柟娉� */ @@ -26,11 +26,11 @@ // 璁$畻鍧囧�� 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