From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt
index 24decf6..0d140d9 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt
@@ -4,6 +4,7 @@
import com.flightfeather.uav.biz.dataanalysis.model.DataAnalysisConfig
import com.flightfeather.uav.biz.dataanalysis.model.ExceptionType
import com.flightfeather.uav.domain.entity.BaseRealTimeData
+import com.flightfeather.uav.socket.eunm.FactorType
/**
* 鏁版嵁瓒呮爣寮傚父鍒嗘瀽
@@ -12,18 +13,28 @@
override fun getExceptionType(): ExceptionType = ExceptionType.TYPE2
- override fun judgeException(p: BaseRealTimeData?, n: BaseRealTimeData): List<Boolean> {
- val res = mutableListOf<Boolean>()
- repeat(config.factorCount) { i ->
- val data = n.getByFactorIndex(i)
- val limit = config.exceptionSetting.getByFactorIndex(i)
+ override fun judgeException(p: BaseRealTimeData?, n: BaseRealTimeData): MutableMap<FactorType, Boolean> {
+ val res = mutableMapOf<FactorType, Boolean>()
+ config.factorFilter.mainList().forEach { f ->
+ val data = n.getByFactorType(f)
+ val limit = config.exceptionSetting.getByFactorType(f)
val bool = if (data != null && limit != null) {
data >= limit
} else {
false
}
- res.add(bool)
+ res[f] = bool
}
+// repeat(config.factorCount) { i ->
+// val data = n.getByFactorIndex(i)
+// val limit = config.exceptionSetting.getByFactorIndex(i)
+// val bool = if (data != null && limit != null) {
+// data >= limit
+// } else {
+// false
+// }
+// res.add(bool)
+// }
return res
}
--
Gitblit v1.9.3