From 1a677d2b4a4bc615602f8c2a22bc07ec1356e5be Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 16 十月 2025 17:39:06 +0800
Subject: [PATCH] 2025.10.16 1. 根据全局响应增强器GlobalResponseAdvice，将原先的BaseResPack接口包装函数统一去除； 2. 新增三种类型的数据产品数据库实体 3. 新增典型问题场景清单中间数据产品接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
index 0cd663b..fe6a7c7 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
@@ -105,8 +105,7 @@
}
}
return@queryCache res
- },
- save = { }
+ }
)
}
@@ -140,10 +139,10 @@
evaluate = it
val score = it.resultscorebef?.toIntOrNull() ?: -1
scoreLevel = when {
- score in 0..39 -> Constant.EvaluationLevel.D.text
- score in 40..89 -> Constant.EvaluationLevel.C.text
- score in 90..99 -> Constant.EvaluationLevel.B.text
- score >= 100 -> Constant.EvaluationLevel.A.text
+ score in 0..49 -> Constant.EvaluationLevel.D.text
+ score in 50..89 -> Constant.EvaluationLevel.C.text
+ score in 90..94 -> Constant.EvaluationLevel.B.text
+ score >= 95 -> Constant.EvaluationLevel.A.text
else -> ""
}
})
@@ -151,7 +150,6 @@
res.sortBy { it.index }
return@queryCache res
},
- save = { }
)
}
@@ -202,7 +200,6 @@
res.sortBy { it.index }
return@queryCache res
},
- save = { }
)
}
@@ -211,23 +208,28 @@
cache = { return@queryCache null },
calculate = {
val res = mutableListOf<DPMonitorDataInfo>()
- val objList = aopDbMapper.monitorobjectversionMapper.selectByExample(Example(Monitorobjectversion::class.java).apply {
+ val sceneIdList = aopDbMapper.monitorobjectversionMapper.selectByExample(Example(Monitorobjectversion::class.java).apply {
createCriteria().andEqualTo("tid", queryOpt.topTaskId)
+ }).map { it.sguid }
+ if (sceneIdList.isEmpty()) return@queryCache res
+
+ val sceneList = aopDbMapper.scenseMapper.selectByExample(Example(Scense::class.java).apply {
+ createCriteria().andIn("guid", sceneIdList)
+ .andEqualTo("typeid", queryOpt.sceneTypeId)
})
- if (objList.isEmpty()) return@queryCache res
aopDbMapper.dustDataResultMapper.selectByExample(Example(DustDataResult::class.java).apply {
createCriteria().andBetween("drTime", queryOpt.startTime, queryOpt.endTime)
- .andIn("objectId", objList.map { it.sguid })
+ .andIn("drSceneId", sceneList.map { it.guid })
}).forEach {
res.add(DPMonitorDataInfo().apply {
+ scene = sceneList.find { scene -> scene.guid == it?.drSceneId }
data = it
})
}
return@queryCache res
},
- save = { }
)
}
}
\ No newline at end of file
--
Gitblit v1.9.3