From 2a5571f1b498eea1f4030d1f0faa42899e174aed Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 11 十一月 2021 11:32:46 +0800
Subject: [PATCH] 1. 修复风向均值算法结果为弧度，需要再转换为角度
---
src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt b/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
index af678c0..eb613f4 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
@@ -2,7 +2,9 @@
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.common.utils.GsonUtils
+import com.flightfeather.uav.lightshare.bean.DataVo
import com.flightfeather.uav.socket.bean.AirData
+import com.flightfeather.uav.socket.eunm.FactorType
/**
* 鏁版嵁搴撹〃瀹炰綋鎵╁睍鏂规硶
@@ -15,9 +17,11 @@
list.add("绾害")
val values = GsonUtils.parserJsonToArrayBeans(factors, AirData::class.java)
values.forEach {
- val name = it.factorName ?: ""
- list.add(name)
- list.add("$name(鐗╃悊閲�)")
+ if (FactorType.outputFactor(it.factorName)) {
+ val name = it.factorName ?: ""
+ list.add(name)
+// list.add("$name(鐗╃悊閲�)")
+ }
}
return list.toTypedArray()
}
@@ -38,12 +42,21 @@
}
val values = GsonUtils.parserJsonToArrayBeans(factors, AirData::class.java)
values.forEach {
- row.add(it.factorData ?: -1.0)
- row.add(it.physicalQuantity ?: -1.0)
+ if (FactorType.outputFactor(it.factorName)) {
+ row.add(it.factorData ?: -1.0)
+// row.add(it.physicalQuantity ?: -1.0)
+ }
}
return row.toTypedArray()
}
+fun RealTimeData.toDataVo() = DataVo(
+ DateUtil.instance.dateToString(dataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
+ deviceCode,
+ GsonUtils.parserJsonToArrayBeans(factors, AirData::class.java),
+ longitude?.toDouble(), latitude?.toDouble()
+)
+
fun ElectricMinuteValue.toAirData(): List<AirData> {
return listOf(
AirData().apply {
--
Gitblit v1.9.3