From 532e6ccc42a1958f8bfc9ffe93eb79382303458d Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 11:32:21 +0800
Subject: [PATCH] 1. 新增aod数据索引，aod详细数据实体类，mapper，service 2. 新增卫星遥测数据网格数据pm2.5、aod数据导入，模板下载 3. FileExchange.kt 新增转换pm2.5和aod数据方法
---
src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuousSingle.kt | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuousSingle.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuousSingle.kt
index e65d775..9a10bdc 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuousSingle.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuousSingle.kt
@@ -11,7 +11,8 @@
override fun onNextData(data: BaseRealTimeData) {
val isContinue = isContinuous(lastData, data)
val hasException = judgeException(lastData, data)
- config.factorFilter.mainList().forEach {f->
+ config.factorFilter.selectedList.forEach {s->
+ val f = s.main
tagMap[f]?.let {
it.eIndex++
if (lastData == null) {
@@ -19,9 +20,8 @@
}
// 鍒ゆ柇鐩搁偦鏁版嵁鏄惁杩炵画骞朵笖鏄惁婊¤冻寮傚父鍒ゆ柇
if (!isContinue) {
- checkResult()
- it.sIndex = it.eIndex
- it.startData = data
+ checkResult(s)
+ it.refreshAfterCheckResult(data)
} else {
if (hasException[f] == true) {
// 淇敼浜嗚捣濮嬫暟鎹殑浣嶇疆,鍙樻洿涓哄嚭鐜板紓甯哥殑璇ュ��,鑰屼笉鏄師鏉ョ殑鍑虹幇寮傚父鐨勬暟鎹殑鍓嶄竴涓��
@@ -30,8 +30,10 @@
it.startData = data
}
it.existException = true
+ it.exceptionData.add(data)
} else {
- checkResult()
+ checkResult(s)
+ it.refreshAfterCheckResult(data)
}
}
}
--
Gitblit v1.9.3