From e2392116cd6f875cdc2f46bc04b04d5305f21b56 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 23 十一月 2023 13:25:04 +0800
Subject: [PATCH] 1. 修改日统计值的排序查询逻辑
---
src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionDataMissing.kt | 67 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionDataMissing.kt b/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionDataMissing.kt
index e47ae04..e85aa12 100644
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionDataMissing.kt
+++ b/src/main/java/com/flightfeather/monitor/analysis/dust/exception/ExceptionDataMissing.kt
@@ -2,35 +2,68 @@
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
import java.time.Duration
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.util.*
/**
* 鏁版嵁缂哄け寮傚父鍒嗘瀽
*/
-class ExceptionDataMissing(config: DustExceptionSetting) : BaseDustExceptionAnalysis(config) {
-
- private var lastData: DustSiteData? = null
-
- override fun init() {
- super.init()
- lastData = null
- }
+class ExceptionDataMissing(config: DustExceptionSetting) : BaseExceptionContinuous(config) {
override fun getExceptionType(): ExceptionType = ExceptionType.TYPE0
- override fun onNextData(data: DustSiteData) {
- lastData?.let {
- val t1 = it.lst
- val t2 = data.lst
- if (Duration.between(t1?.toInstant(), t2.toInstant()).toMinutes() > config.missDataMinutes) {
- resultList.add(newResult(it, data))
+// override fun onNextData(data: DustSiteData) {
+// lastData?.let {
+// val t1 = it.lst
+// val t2 = data.lst
+// val b1 = Duration.between(t1?.toInstant(), t2.toInstant()).toMinutes() >= config.missDataMinutes
+// if (b1) {
+// resultList.add(newResult(it, data))
+// }
+// }
+// lastData = data
+// }
+
+ override fun judgeException(p: DustSiteData?, n: DustSiteData): Boolean {
+ // 鏁版嵁缂哄け寮傚父涓嶅悓浜庡叾浠栧紓甯哥殑鐐瑰湪浜庡綋鏃ラ涓暟鎹鏋滀笉瀛樺湪锛岄渶瑕佸仛涓�娆″垽鏂�
+ var pData: DustSiteData? = null
+ if (p == null) {
+ //褰撻涓暟鎹繘鍏ユ椂锛岄渶瑕佸垽鏂槸鍚︿负褰撴棩鐨勭涓�涓暟鎹�
+ val time = LocalDateTime.ofInstant(n.lst.toInstant(), ZoneId.systemDefault())
+ if (time.hour == 0 && time.minute == 0) {
+ return false
+ }
+ // 濡傛灉缂哄け褰撴棩棣栦釜鏁版嵁锛屽垯闇�瑕佸皢褰撳墠鏁版嵁n鍜屽綋鏃�0鐐硅繘琛屾瘮杈冿紝璁板綍鏁版嵁缂哄け寮傚父
+ else {
+ startData = DustSiteData().apply {
+ mnCode = n.mnCode
+ lst = Date.from(time.withHour(0).withMinute(0).withSecond(0).atZone(ZoneId.systemDefault())
+ .toInstant())
+ flag = DataStatus.A.value
+ }
+ pData = startData
}
}
- lastData = data
+ if (pData == null) return false
+ val t1 = pData.lst
+ val t2 = n.lst
+ val b1 = Duration.between(t1?.toInstant(), t2.toInstant()).toMinutes() >= config.missDataMinutes
+ val b2 = n.flag == DataStatus.A.value || n.flag == DataStatus.D.value
+ return b1 || b2
}
- override fun onDone() {
- //do noting
+ override fun judgeDuration(sIndex: Int, eIndex: Int): Boolean {
+ return true
+ }
+
+ /**
+ * 閽堝鏁版嵁缂哄け寮傚父, 瀵规暟鎹殑杩炵画鎬т笉鍋氬垽鏂�
+ */
+ override fun isContinuous(d1: DustSiteData?, d2: DustSiteData): Boolean {
+ return true
}
}
\ No newline at end of file
--
Gitblit v1.9.3