From 9d4ca2e7bdfc0d634b0cc27c7fbe23740f4bb398 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 15:43:30 +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 | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 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 027f57d..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,29 +11,56 @@
override fun onNextData(data: BaseRealTimeData) {
val isContinue = isContinuous(lastData, data)
val hasException = judgeException(lastData, data)
- repeat(config.factorCount) { i ->
- eIndex[i]++
- if (lastData == null) {
- startData[i] = data
- }
- // 鍒ゆ柇鐩搁偦鏁版嵁鏄惁杩炵画骞朵笖鏄惁婊¤冻寮傚父鍒ゆ柇
- if (!isContinue) {
- checkResult()
- sIndex[i] = eIndex[i]
- startData[i] = data
- } else {
- if (hasException[i]) {
- // 淇敼浜嗚捣濮嬫暟鎹殑浣嶇疆,鍙樻洿涓哄嚭鐜板紓甯哥殑璇ュ��,鑰屼笉鏄師鏉ョ殑鍑虹幇寮傚父鐨勬暟鎹殑鍓嶄竴涓��
- if (!existException[i]) {
- sIndex[i] = eIndex[i]
- startData[i] = data
- }
- existException[i] = true
+ config.factorFilter.selectedList.forEach {s->
+ val f = s.main
+ tagMap[f]?.let {
+ it.eIndex++
+ if (lastData == null) {
+ it.startData = data
+ }
+ // 鍒ゆ柇鐩搁偦鏁版嵁鏄惁杩炵画骞朵笖鏄惁婊¤冻寮傚父鍒ゆ柇
+ if (!isContinue) {
+ checkResult(s)
+ it.refreshAfterCheckResult(data)
} else {
- checkResult()
+ if (hasException[f] == true) {
+ // 淇敼浜嗚捣濮嬫暟鎹殑浣嶇疆,鍙樻洿涓哄嚭鐜板紓甯哥殑璇ュ��,鑰屼笉鏄師鏉ョ殑鍑虹幇寮傚父鐨勬暟鎹殑鍓嶄竴涓��
+ if (!it.existException) {
+ it.sIndex = it.eIndex
+ it.startData = data
+ }
+ it.existException = true
+ it.exceptionData.add(data)
+ } else {
+ checkResult(s)
+ it.refreshAfterCheckResult(data)
+ }
}
}
}
+// repeat(config.factorCount) { i ->
+// eIndex[i]++
+// if (lastData == null) {
+// startData[i] = data
+// }
+// // 鍒ゆ柇鐩搁偦鏁版嵁鏄惁杩炵画骞朵笖鏄惁婊¤冻寮傚父鍒ゆ柇
+// if (!isContinue) {
+// checkResult()
+// sIndex[i] = eIndex[i]
+// startData[i] = data
+// } else {
+// if (hasException[i]) {
+// // 淇敼浜嗚捣濮嬫暟鎹殑浣嶇疆,鍙樻洿涓哄嚭鐜板紓甯哥殑璇ュ��,鑰屼笉鏄師鏉ョ殑鍑虹幇寮傚父鐨勬暟鎹殑鍓嶄竴涓��
+// if (!existException[i]) {
+// sIndex[i] = eIndex[i]
+// startData[i] = data
+// }
+// existException[i] = true
+// } else {
+// checkResult()
+// }
+// }
+// }
lastData = data
}
}
\ No newline at end of file
--
Gitblit v1.9.3