From a3cc1d220f8a1de11874bebceba0130d32157ff1 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 30 九月 2025 09:26:32 +0800 Subject: [PATCH] 2025.9.30 1. 联合前端调试数据产品接口(待完成) --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationsubruleServiceImpl.kt | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationsubruleServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationsubruleServiceImpl.kt index e972031..0d3ba73 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationsubruleServiceImpl.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationsubruleServiceImpl.kt @@ -6,6 +6,7 @@ import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule2 import cn.flightfeather.supervision.domain.ds1.mapper.EvaluationruleMapper import cn.flightfeather.supervision.domain.ds1.mapper.EvaluationsubruleMapper +import cn.flightfeather.supervision.domain.ds1.mapper.EvaluationsubruleMapper2 import cn.flightfeather.supervision.domain.ds1.repository.EvaluationRep import cn.flightfeather.supervision.domain.ds1.repository.EvaluationRuleRep import cn.flightfeather.supervision.domain.ds1.repository.SceneRep @@ -16,6 +17,7 @@ @Service class EvaluationsubruleServiceImpl( + val evaluationsubruleMapper2: EvaluationsubruleMapper2, val evaluationsubruleMapper: EvaluationsubruleMapper, val evaluationruleMapper: EvaluationruleMapper, private val evaluationRep: EvaluationRep, @@ -23,28 +25,28 @@ private val sceneRep: SceneRep, ) : EvaluationsubruleService { - override fun findOne(id: String): Evaluationsubrule = evaluationsubruleMapper.selectByPrimaryKey(id) + override fun findOne(id: String): Evaluationsubrule2 = evaluationsubruleMapper2.selectByPrimaryKey(id) override fun findAll(): MutableList<Evaluationsubrule> = evaluationsubruleMapper.selectAll() - override fun save(evaluationsubrule: Evaluationsubrule): Int = evaluationsubruleMapper.insert(evaluationsubrule) + override fun save(evaluationsubrule: Evaluationsubrule2): Int = evaluationsubruleMapper2.insert(evaluationsubrule) - override fun update(evaluationsubrule: Evaluationsubrule): Int = - evaluationsubruleMapper.updateByPrimaryKey(evaluationsubrule) + override fun update(evaluationsubrule: Evaluationsubrule2): Int = + evaluationsubruleMapper2.updateByPrimaryKey(evaluationsubrule) - override fun delete(id: String): Int = evaluationsubruleMapper.deleteByPrimaryKey(id) + override fun delete(id: String): Int = evaluationsubruleMapper2.deleteByPrimaryKey(id) override fun findByRuleId(erguid: String): List<Evaluationsubrule2> { return evaluationRuleRep.findSubRule(erguid) } - override fun search(districtCode: String, sceneTypeId: String, version: String?): List<Evaluationsubrule> { - val result = mutableListOf<Evaluationsubrule>() + override fun search(districtCode: String, sceneTypeId: String, version: String?): List<Evaluationsubrule2> { + val result = mutableListOf<Evaluationsubrule2>() evaluationruleMapper.selectByExample(Example(Evaluationrule::class.java).apply { createCriteria().andEqualTo("districtcode", districtCode) .andEqualTo("scensetypeid", sceneTypeId) }).takeIf { it.isNotEmpty() }?.get(0)?.let { rule -> - evaluationsubruleMapper.selectByExample(Example(Evaluationsubrule::class.java).apply { + evaluationsubruleMapper2.selectByExample(Example(Evaluationsubrule2::class.java).apply { createCriteria().andEqualTo("erguid", rule.guid) }) }?.also { -- Gitblit v1.9.3