From 74ffc8ebf3a25d2e3cee758954ce6efc163cb864 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 02 十二月 2021 16:11:57 +0800
Subject: [PATCH] 1. 用电量日分析
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt | 39 ++-------------------------------------
1 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt
index d055539..f443876 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt
@@ -200,7 +200,7 @@
d1eA = d?.mvElectricityA ?: .0
d1eB = d?.mvElectricityB ?: .0
d1eC = d?.mvElectricityC ?: .0
- val s = getStatus(d, d1)
+ val s = ElectricDailyAnalysis.getStatus(d, d1)
d1Status = s.first
d1StatusName = s.second
d1Avg = s.third
@@ -238,7 +238,7 @@
d2eA = d?.mvElectricityA ?: .0
d2eB = d?.mvElectricityB ?: .0
d2eC = d?.mvElectricityC ?: .0
- val s = getStatus(d, d2)
+ val s = ElectricDailyAnalysis.getStatus(d, d2)
d2Status = s.first
d2StatusName = s.second
d2Avg = s.third
@@ -274,41 +274,6 @@
}
return BaseResponse(true, head = DataHead(pageInfo.pageNum, pageInfo.pages), data = result)
- }
-
- /**
- * 鑾峰彇璁惧褰撳墠杩愯鐘舵��
- * @param e 璁惧鐢ㄧ數閲忕洃娴嬫暟鎹�
- * @param d 浼佷笟璁惧淇℃伅
- * @return 鏁版嵁瀵瑰簲缁撴灉淇℃伅锛�<鐘舵�佺紪鍙凤紝鐘舵�佹弿杩帮紝鐢垫祦鍧囧��>
- */
- private fun getStatus(e: ElectricMinuteValue?, d: CompanyDevice?): Triple<String, String, Double> {
- var values = mutableListOf<Int>().apply {
- d?.cdLimits?.split(";")?.forEach {
- it.toIntOrNull()?.let { i -> add(i) }
- }
- }
- var status = d?.cdStatus?.split(";") ?: emptyList()
- var statusNames = d?.cdStatusName?.split(";") ?: emptyList()
- if (values.isEmpty()) values = mutableListOf(1, 100)
- if (status.isEmpty()) status = listOf("0", "2", "3")
- if (statusNames.isEmpty()) statusNames = listOf("寰呮満", "杩愯", "瓒呰礋鑽�")
- if (e == null) {
- return Triple(status.first(), statusNames.first(), .0)
- }
-
- val electricityList = mutableListOf<Double>()
- electricityList.add(e.mvElectricityA)
- electricityList.add(e.mvElectricityB)
- electricityList.add(e.mvElectricityC)
-
- val avg = round(electricityList.average() * 100) / 100
- for (i in values.indices) {
- if (avg < values[i]) {
- return Triple(status[i], statusNames[i], avg)
- }
- }
- return Triple(status.last(), statusNames.last(), avg)
}
override fun dailyStatistics(cId: String, startTime: String?, endTime: String?): BaseResponse<List<ElectricDailyInfo>> {
--
Gitblit v1.9.3