From 6e1095e946997e406926c204ceeb5c820dbd07c1 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期二, 13 八月 2024 23:51:47 +0800
Subject: [PATCH] 1. 修复文件扩展名获取错误问题 2. 调试完善设备信息相关接口
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
index 31e2109..42f8c01 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
@@ -52,6 +52,10 @@
}
}
+ override fun getDeviceCode(data: HourDustData?): String? {
+ return data?.mncode
+ }
+
override fun fetchDataResources(evaluationScene: AopDataSource.EvaluationScene): List<List<HourDustData?>> {
val dustSiteMaps = dustSiteMapMapper.selectByExample(Example(DustSiteMap::class.java).apply {
createCriteria().andEqualTo("svUserId", evaluationScene.userInfo.value?.guid)
@@ -117,11 +121,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 count(dataList: List<List<HourDustData?>>): Int {
--
Gitblit v1.9.3