From 9ed0b1847912221197697791d69e01ccae17f5b9 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 27 八月 2024 17:36:11 +0800
Subject: [PATCH] 1. 新增NO监测因子 2. 新增第三方数据接口数据获取相关模块

---
 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