From c1becf4cbd2e99601ce011c14b8742427249cfb4 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 09 一月 2024 17:25:05 +0800
Subject: [PATCH] 1. 多项调整
---
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/score/construction/JADataAnalysis.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
similarity index 95%
rename from src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/construction/JADataAnalysis.kt
rename to src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
index d38fe60..31e2109 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/construction/JADataAnalysis.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
@@ -1,10 +1,9 @@
-package cn.flightfeather.supervision.business.autooutput.score.construction
+package cn.flightfeather.supervision.business.autooutput.dataanalysis
import cn.flightfeather.supervision.business.autooutput.AopOutput
import cn.flightfeather.supervision.business.autooutput.datasource.AopDataSource
import cn.flightfeather.supervision.business.autooutput.datasource.AopDbMapper
import cn.flightfeather.supervision.business.autooutput.datasource.AopSceneTypeCheck
-import cn.flightfeather.supervision.business.autooutput.score.AopDataAnalysis
import cn.flightfeather.supervision.domain.ds2.entity.DustSiteMap
import cn.flightfeather.supervision.domain.ds2.entity.HourDustData
import cn.flightfeather.supervision.domain.ds2.mapper.DustSiteMapMapper
@@ -20,7 +19,7 @@
* 闈欏畨宸ュ湴鎵皹鐩戞祴鏁版嵁缁熻
*/
@Component
-class JADataAnalysis(
+class JACsDataAnalysis(
aopDbMapper: AopDbMapper,
aopSceneTypeCheck: AopSceneTypeCheck,
aopOutput: AopOutput,
@@ -39,6 +38,7 @@
var count = 0
hourDustDataMapper.selectByExample(Example(HourDustData::class.java).apply {
createCriteria().andBetween("lst", source?.config?.startTime, source?.config?.endTime)
+ .andEqualTo("flag", "N")
}).forEach {
it?.dustvalue?.let { v ->
total += v
@@ -116,11 +116,11 @@
}
}
- override fun overAvgRate(avg: Double, dAvg: Double?): Double {
+ override fun overAvgRate(avg: Double, dAvg: Double?): Double? {
return if (dAvg != null) {
round(((avg - dAvg) / dAvg) * 1000) / 1000
} else {
- .0
+ null
}
}
--
Gitblit v1.9.3