From 0c59552dc14c9023d4c0a9d57509cce1d5a6d6da Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-socket-1129'
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt | 6 ++++++
1 files changed, 6 insertions(+), 0 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 7051a4b..9c2af53 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)
@@ -60,6 +64,8 @@
if (dustSiteMaps.isEmpty()) return emptyList()
val mnCodeList = dustSiteMaps.map { it?.jaMnCode }
+ if (mnCodeList.isEmpty()) return emptyList()
+
val map = mutableMapOf<String?, MutableList<HourDustData?>>()
hourDustDataMapper.selectByExample(Example(HourDustData::class.java).apply {
createCriteria().andBetween("lst", evaluationScene.config?.startTime, evaluationScene.config?.endTime)
--
Gitblit v1.9.3