From aed297a5fbc8df9dab01b28da21f872ee546b43c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 13 十月 2025 16:15:11 +0800
Subject: [PATCH] 2025.10.13 1. 统一调整controller层的返回类型，通过添加全局响应增强器GlobalResponseAdvice来管理返回结果； 2. 新增mybatis-generator自定义插件，实现给数据库实体entity自动添加swagger注解@ApiModel和@ApiModelProperty
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt
index 1f84f3e..bf5e921 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt
@@ -74,8 +74,14 @@
var tempAvg = TempResult()
var tempMax = TempResult()
var tempMin = TempResult()
+ var deviceCode: String? = null
dataList.forEach {
- // 鐩戞祴鐐规湁澶氬彴璁惧鏃讹紝姣忓彴璁惧鍗曠嫭缁熻锛屽彇鍧囧�兼渶楂樼殑涓虹粺璁＄粨鏋�
+ // 鐩戞祴鐐规湁澶氬彴璁惧鏃讹紝姣忓彴璁惧鍗曠嫭璁板綍
+ deviceCode = if (it.isNotEmpty()) {
+ getDeviceCode(it[0])
+ } else {
+ null
+ }
val _tempExceedTimes = TempResult()
val _tempAvg = TempResult()
val _tempMax = TempResult()
@@ -99,6 +105,7 @@
val dustDataResult = DustDataResult().apply {
drSceneId = evaluationScene.scene.value?.guid
drSceneName = evaluationScene.scene.value?.name
+ drDeviceCode = deviceCode
drTime = source?.config?.startTime
drExceedTimes = tempExceedTimes.count
drAvg = tempAvg.avg
@@ -122,6 +129,11 @@
abstract fun districtAvg(source: AopDataSource?): Double?
/**
+ * 鑾峰彇璁惧缂栧彿
+ */
+ abstract fun getDeviceCode(data: T?): String?
+
+ /**
* 鑾峰彇鍘熷鐩戞祴鏁版嵁
*/
abstract fun fetchDataResources(evaluationScene: AopDataSource.EvaluationScene): List<List<T?>>
--
Gitblit v1.9.3