2025.10.13 1. 统一调整controller层的返回类型，通过添加全局响应增强器GlobalResponseAdvice来管理返回结果； ...

feiyu02

2025-10-13 aed297a5fbc8df9dab01b28da21f872ee546b43c

 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 = {  }
        )
    }
}