From f373bbf83d9d2a7e5f96118d7dcd658c9fea8bc8 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 14 八月 2025 17:27:44 +0800 Subject: [PATCH] 2025.8.14 1. 新增文件导入场景信息接口 2. 新增导出接口文档接口 --- src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 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 4a2d87a..0aa07ff 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,6 +55,9 @@ @Autowired lateinit var subTaskRep: SubTaskRep + @Autowired + lateinit var evaluationruleMapper: EvaluationruleMapper + /** * 闈欏畨宸ュ湴鑷瘎 */ @@ -79,11 +85,11 @@ */ @Test fun test() { - val taskId = "88wgq9l5gm9cUMg1" - val districtCode = "310104" +// val taskId = "88wgq9l5gm9cUMg1" +// val districtCode = "310104" val districtName = "寰愭眹鍖�" val year = 2024 - val month = 5 + val month = 11 val sceneType = Constant.SceneType.TYPE5.value.toInt() // xhFuDataAnalysis.setResource(taskId, sceneType, year, month) // xhFuDataAnalysis.execute() @@ -144,7 +150,25 @@ @Test fun aopSubtask() { - val s = subTaskRep.findOne("yMRHdPg7e4i8M6aB") + 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