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/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt b/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
index 852f32f..a904ee8 100644
--- a/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
+++ b/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
@@ -9,6 +9,8 @@
import cn.flightfeather.supervision.business.autooutput.datasource.AopDataConfig
import cn.flightfeather.supervision.business.autooutput.score.AopCreditCode
import cn.flightfeather.supervision.common.utils.Constant
+import cn.flightfeather.supervision.domain.ds1.entity.Evaluationrule
+import cn.flightfeather.supervision.domain.ds1.mapper.EvaluationruleMapper
import cn.flightfeather.supervision.domain.ds1.repository.SubTaskRep
import cn.flightfeather.supervision.lightshare.service.SearchService
import cn.flightfeather.supervision.lightshare.vo.ExcelConfigVo
@@ -19,6 +21,7 @@
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.junit.jupiter.SpringExtension
import org.springframework.test.context.junit4.SpringRunner
+import tk.mybatis.mapper.entity.Example
@RunWith(SpringRunner::class)
@ExtendWith(SpringExtension::class)
@@ -52,26 +55,29 @@
@Autowired
lateinit var subTaskRep: SubTaskRep
+ @Autowired
+ lateinit var evaluationruleMapper: EvaluationruleMapper
+
/**
* 闈欏畨宸ュ湴鑷瘎
*/
@Test
fun test1() {
- val taskId = "P7hsgDedyN9XLrbt"
+ val taskId = "qpou6fonNsye9WC1"
val districtCode = "310106"
- val year = 2024
- val month = 6
+ val year = 2025
+ val month = 9
val sceneType = Constant.SceneType.TYPE1.value.toInt()
jaCsDataAnalysis.setResource(taskId, sceneType, year, month)
jaCsDataAnalysis.execute()
aopEvaluation.executeByTopTask(taskId, sceneType)
- val mode = 9
- searchService.writeToFile(ExcelConfigVo(
- taskId,
- districtCode = districtCode,
- sceneType = sceneType), mode)
+// val mode = 9
+// searchService.writeToFile(ExcelConfigVo(
+// taskId,
+// districtCode = districtCode,
+// sceneType = sceneType), mode)
}
/**
@@ -147,4 +153,22 @@
val s = subTaskRep.findOne("B6kyaAjJRoGJ2Yur")
aopEvaluation.executeBySubTask(s!!)
}
+
+ @Test
+ fun test3() {
+ val result = evaluationruleMapper.selectByExample(Example(Evaluationrule::class.java).apply {
+ createCriteria()
+ .andEqualTo("tasktypeid", 99)
+ .andEqualTo("scensetypeid", 1)
+ and(createCriteria().orEqualTo("provincecode", "31").orIsNull("provincecode"))
+ and(createCriteria().orEqualTo("citycode", "3100").orIsNull("citycode"))
+ and(createCriteria().orEqualTo("districtcode", "310104").orIsNull("districtcode"))
+ and(createCriteria().orEqualTo("towncode", "310104014").orIsNull("towncode"))
+ orderBy("towncode").desc()
+ .orderBy("districtcode").desc()
+ .orderBy("citycode").desc()
+ .orderBy("provincecode").desc()
+ })
+ println(result.map { it.rulename })
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3