From 29383149f7040d89ae00ad48dc48bbcf46587946 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 01 九月 2025 17:32:53 +0800
Subject: [PATCH] 2025.9.1 1. 新增走航任务统计功能（待完成）
---
src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt | 8 +++-----
1 files changed, 3 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 c0bf033..e0f3799 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
@@ -7,9 +7,6 @@
import com.flightfeather.uav.socket.bean.AirData
import com.flightfeather.uav.socket.eunm.FactorType
import com.flightfeather.uav.socket.eunm.FactorType.*
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.util.*
import kotlin.math.atan
import kotlin.math.cos
import kotlin.math.round
@@ -26,7 +23,7 @@
list.add("绾害")
val values = GsonUtils.parserJsonToArrayBeans(factors, AirData::class.java)
values.forEach {
- if (FactorType.outputFactor(it.factorName)) {
+ if (FactorType.isOutputFactor(it.factorName)) {
val name = it.factorName ?: ""
list.add(name)
// list.add("$name(鐗╃悊閲�)")
@@ -51,7 +48,7 @@
}
val values = GsonUtils.parserJsonToArrayBeans(factors, AirData::class.java)
values.forEach {
- if (FactorType.outputFactor(it.factorName)) {
+ if (FactorType.isOutputFactor(it.factorName)) {
row.add(it.factorData ?: -1.0)
// row.add(it.physicalQuantity ?: -1.0)
}
@@ -142,6 +139,7 @@
VELOCITY -> TODO("no such factor")
TIME -> TODO("no such factor")
HEIGHT -> TODO("no such factor")
+ else -> TODO("no such factor")
}
}
--
Gitblit v1.9.3