From 88ae069fcf657c1790bb04b444e150c06f04e5f6 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 30 十二月 2021 11:50:46 +0800
Subject: [PATCH] 1. 网格化风向权重分析完善
---
src/main/kotlin/com/flightfeather/uav/dataprocess/ElectricDailyAnalysis.kt | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/dataprocess/ElectricDailyAnalysis.kt b/src/main/kotlin/com/flightfeather/uav/dataprocess/ElectricDailyAnalysis.kt
index a611d97..e6e9ebc 100644
--- a/src/main/kotlin/com/flightfeather/uav/dataprocess/ElectricDailyAnalysis.kt
+++ b/src/main/kotlin/com/flightfeather/uav/dataprocess/ElectricDailyAnalysis.kt
@@ -19,11 +19,11 @@
// 杩斿洖缁撴灉
val result = mutableListOf<ElectricDailyInfo>()
// 姣忔棩缁熻淇℃伅
- val dailyInfoMap = mutableMapOf<String, ElectricDailyInfo>()
+ val dailyInfoMap = mutableMapOf<Int, ElectricDailyInfo>()
// 1.鏁版嵁鍑嗗
val deviceMap = mutableMapOf<String, CompanyDevice>()
- val dataMap = mutableMapOf<String, MutableMap<String, MutableList<ElectricMinuteValue>>>()
+ val dataMap = mutableMapOf<String, MutableMap<Int, MutableList<ElectricMinuteValue>>>()
deviceList.forEach {
// 鐩戞祴鏁版嵁
if (!dataMap.containsKey(it.cdDeviceCode)) {
@@ -35,7 +35,8 @@
// 2.杞鏁版嵁锛岀粺璁℃瘡鏃ョ殑鍚勯」鐗瑰緛
dataList.forEach {
// 鑾峰彇鏃ユ湡
- val day = DateUtil.instance.dateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD) ?: ""
+ val date = DateUtil.instance.dateToString(it.mvDataTime, DateUtil.DateStyle.YYYYMMDD) ?: ""
+ val day = date.toIntOrNull() ?: 0
// 姣忔棩瀵瑰簲涓�缁勬暟鎹�
if (dataMap[it.mvStatCode]?.containsKey(day) != true) dataMap[it.mvStatCode]?.put(day, mutableListOf())
val dayList = dataMap[it.mvStatCode]?.get(day)!!
@@ -47,7 +48,8 @@
// 2.1 鏍规嵁鏁版嵁鍒囨崲褰撳墠璁惧绫诲瀷
if (!dailyInfoMap.containsKey(day)) dailyInfoMap[day] = ElectricDailyInfo()
val dayResult = dailyInfoMap[day]!!
- dayResult.day = day
+ dayResult.day = DateUtil.instance.dateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD) ?: ""
+ dayResult.dayIndex = day
dayResult.changeType(device)
// 2.2 姣忔棩鑾峰彇鐨勯涓暟鎹紝鍗充负褰撴棩璇ヨ澶囧紑鍚椂闂�
if (dayList.size == 1) dayResult.setStartTime(it.mvDataTime)
@@ -58,18 +60,41 @@
// 2.5 缁熻褰撴棩璁惧杩愯鏃舵锛堝皬鏃讹級
val hour = LocalDateTime.ofInstant(it.mvDataTime.toInstant(), ZoneId.systemDefault()).hour
dayResult.addRunPeriod(hour)
+ // 2.6 绱鐢ㄧ數閲�
+ dayResult.addPower(it)
+ // 2.7 璁惧棣栨浠庤繍琛屽彉涓哄緟鏈烘垨鍏抽棴鐘舵�佹椂锛岃涓烘槸璁惧鐨勫叧闂椂闂�
+ dayResult.setEndTime(status, it)
}
- // 2.6 缁熻鍚勫彴璁惧姣忔棩缁撴潫鏃堕棿鍙婂垎鏋愮粨鏋�
+ // 2.6 缁熻鍚勫彴璁惧鍒嗘瀽缁撴灉
dataMap.forEach { (dCode, dayMap) ->
dayMap.forEach { (day, list) ->
dailyInfoMap[day]?.apply {
changeType(deviceMap[dCode])
- setEndTime(list.last().mvDataTime)
+ setEndTime2(list.last().mvDataTime)
getResult()
}
}
}
dailyInfoMap.forEach { (_,v)-> result += v }
+ result.sortBy { it.dayIndex }
+ for (i in result.indices) {
+ if (i > 0) {
+ val last = result[i - 1]
+ val d = result[i]
+
+ // 閽堝涓ょ璁惧锛屽綋鏄ㄥぉ鐨勮澶囨湭鍏抽棴锛屼笖浠婂ぉ鐨勫紑鍚椂闂翠负0鐐�0鍒嗗唴鏃讹紝璁や负璁惧璺ㄦ棩杩愯
+ if (last.plETimeStr == null && d.plRTimeStr?.substring(11, 16) == "00:00") {
+ d.plRTimeStr = null
+ d.rTimeDiff = null
+ d.sResult = true
+ }
+ if (last.pfETimeStr == null && d.pfRTimeStr?.substring(11, 16) == "00:00") {
+ d.pfRTimeStr = null
+ d.rTimeDiff = null
+ d.sResult = true
+ }
+ }
+ }
return result
}
--
Gitblit v1.9.3