From 21427a082fc07bed414dbfe0473678d8aeb37006 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 02 十一月 2023 11:56:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/flightfeather/monitor/analysis/dust/BaseDustExceptionAnalysis.kt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/BaseDustExceptionAnalysis.kt b/src/main/java/com/flightfeather/monitor/analysis/dust/BaseDustExceptionAnalysis.kt
index 35cb387..c96f0b0 100644
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/BaseDustExceptionAnalysis.kt
+++ b/src/main/java/com/flightfeather/monitor/analysis/dust/BaseDustExceptionAnalysis.kt
@@ -32,15 +32,15 @@
/**
* 鐢熸垚涓�鏉″紓甯稿垎鏋愮粨鏋�
*/
- protected fun newResult(p: DustSiteData?, n: DustSiteData): DustExceptionData {
+ open fun newResult(p: DustSiteData, n: DustSiteData?): DustExceptionData {
val eType = getExceptionType()
return DustExceptionData().apply {
- mnCode = n.mnCode
+ mnCode = p.mnCode
exception = eType.des
exceptionType = eType.value
region = config.region
- beginTime = if (p == null) n.lst else p.lst
- endTime = n.lst
+ beginTime = p.lst
+ endTime = if (n == null) p.lst else n.lst
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3