From 3ba74e7692143fd6dcf4dd885f80f95dfef8387e Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 16:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature-risk_analysis' into feature-risk_analysis
---
src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionNoFluctuation.kt | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionNoFluctuation.kt b/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionNoFluctuation.kt
index c83b49e..a6d0e4f 100644
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionNoFluctuation.kt
+++ b/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionNoFluctuation.kt
@@ -2,6 +2,7 @@
import com.flightfeather.monitor.domain.ds1.entity.DustExceptionSetting
import com.flightfeather.monitor.domain.ds1.entity.DustSiteData
+import com.flightfeather.monitor.enumration.dust.DataStatus
import com.flightfeather.monitor.enumration.dust.ExceptionType
/**
@@ -13,7 +14,10 @@
override fun judgeException(p: DustSiteData?, n: DustSiteData): Boolean {
if (p == null) return false
- return p.dustValue == n.dustValue
+ val b1 = p.dustValue == n.dustValue
+ val b2 = p.flag != DataStatus.A.value && p.flag != DataStatus.D.value
+ val b3 = n.flag != DataStatus.A.value && n.flag != DataStatus.D.value
+ return b1 && b2 && b3
}
override fun judgeDuration(sIndex: Int, eIndex: Int): Boolean {
--
Gitblit v1.9.3