From dc4f12f66685260ac357997680e5f3fe723c3c4a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 12 九月 2025 17:22:40 +0800
Subject: [PATCH] 2025.9.12 1. 新增监测设备和巡查场景信息的匹配功能
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JSDustDataAnalysis.kt | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JSDustDataAnalysis.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JSDustDataAnalysis.kt
index 83ab24d..24816d2 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JSDustDataAnalysis.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JSDustDataAnalysis.kt
@@ -57,6 +57,10 @@
}
}
+ override fun getDeviceCode(data: JSDustData?): String? {
+ return data?.mnCode
+ }
+
override fun fetchDataResources(evaluationScene: AopDataSource.EvaluationScene): List<List<JSDustData?>> {
val dustSiteMaps = jsDustSiteMapMapper.selectByExample(Example(JSDustSiteMap::class.java).apply {
createCriteria().andEqualTo("svUserId", evaluationScene.userInfo.value?.guid)
@@ -116,11 +120,7 @@
}
override fun overAvgRate(avg: Double, dAvg: Double?): Double? {
- return if (dAvg != null) {
- round(((avg - dAvg) / dAvg) * 1000) / 1000
- } else {
- null
- }
+ return super.overAvgRate(avg, dAvg)
}
override fun effectiveRate(
--
Gitblit v1.9.3