From 33e5d4cbe1dcf35590b0a149ddcfed5134dae051 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 04 七月 2025 17:28:50 +0800
Subject: [PATCH] 2025.7.4 1. 补充遗漏的新增溯源消息实体
---
src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt | 33 +++++++++++++++++----------------
1 files changed, 17 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..741a06a 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
@@ -10,6 +10,8 @@
import java.time.ZoneId
import java.util.*
import javax.persistence.Column
+import javax.persistence.GeneratedValue
+import javax.persistence.GenerationType
import javax.persistence.Id
import kotlin.math.atan
import kotlin.math.cos
@@ -21,6 +23,7 @@
*/
open class BaseRealTimeData {
@Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
var id: Int? = null
@Column(name = "device_code")
@@ -69,6 +72,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 +114,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 +134,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 +153,7 @@
//闄ら鍚戝鐨勫叾浠栧洜瀛愰噰鐢ㄧ畻鏈钩鍧囨硶姹傚彇鍧囧��
val tmpList = mutableListOf<AvgPair>()
- repeat(17) {
+ repeat(18) {
tmpList.add(AvgPair(0f, 0))
}
@@ -274,6 +268,12 @@
this.c++
}
}
+ tmpList[17].apply {
+ it.no?.let {
+ t += it
+ this.c++
+ }
+ }
}
return RealTimeDataGridMin().apply {
@@ -298,6 +298,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