From e6cc379fbef57277568ee667ec07a508b3dcc479 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 29 八月 2024 17:35:35 +0800
Subject: [PATCH] 1. 新增NO监测因子 2. 新增第三方数据接口数据获取相关模块
---
src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt b/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
index 3628094..d4d315c 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
@@ -69,6 +69,9 @@
@Column(name = "NOI")
var noi: Float? = null
+ @Column(name = "NO")
+ var no: Float? = null
+
var velocity: Float? = null
@Column(name = "wind_speed")
@@ -108,20 +111,7 @@
add(AirData().apply { setData(FactorType.WIND_SPEED, windSpeed) })
add(AirData().apply { setData(FactorType.WIND_DIRECTION, windDirection) })
add(AirData().apply { setData(FactorType.HEIGHT, height) })
- }
- }
-
- fun getByFactorIndex(i: Int): Float? {
- return when (i) {
- 0 -> no2
- 1 -> co
- 2 -> h2s
- 3 -> so2
- 4 -> o3
- 5 -> pm25
- 6 -> pm10
- 7 -> voc
- else -> null
+ add(AirData().apply { setData(FactorType.NO, no) })
}
}
@@ -141,10 +131,11 @@
FactorType.LNG -> longitude?.toFloat()
FactorType.LAT -> latitude?.toFloat()
FactorType.VELOCITY -> velocity
-// FactorType.TIME -> noi
+// FactorType.TIME -> dataTime?.time?.toFloat()
FactorType.WIND_SPEED -> windSpeed
FactorType.WIND_DIRECTION -> windDirection
FactorType.HEIGHT -> height
+ FactorType.NO -> no
else -> null
}
}
@@ -159,7 +150,7 @@
//闄ら鍚戝鐨勫叾浠栧洜瀛愰噰鐢ㄧ畻鏈钩鍧囨硶姹傚彇鍧囧��
val tmpList = mutableListOf<AvgPair>()
- repeat(17) {
+ repeat(18) {
tmpList.add(AvgPair(0f, 0))
}
@@ -274,6 +265,12 @@
this.c++
}
}
+ tmpList[17].apply {
+ it.no?.let {
+ t += it
+ this.c++
+ }
+ }
}
return RealTimeDataGridMin().apply {
@@ -298,6 +295,7 @@
velocity = tmpList[14].avg()
windSpeed = tmpList[15].avg()
height = tmpList[16].avg()
+ no = tmpList[17].avg()
if (c != 0) {
val avgU = u / c
--
Gitblit v1.9.3