From 5c8eff8effc4e4f513fddec5569c60b4c8247f07 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 8 Nov 2024 16:08:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=90=9C=E7=B4=A2=E5=8E=9F=E5=AD=90=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=8C=B9=E9=85=8D=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/ModelServiceImpl.java | 24 +++++++++++++++++++ src/main/resources/mapper/ModelCaseMapper.xml | 1 + 2 files changed, 25 insertions(+) diff --git a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java index 10e8ff7..50d9de2 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java @@ -27,6 +27,7 @@ import com.supervision.police.mapper.*; import com.supervision.police.mybatis.RowSqlMapper; import com.supervision.police.service.*; import com.supervision.utils.CalculationUtil; +import com.supervision.utils.IndexRuleUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -221,6 +222,9 @@ public class ModelServiceImpl implements ModelService { log.error("未找到指标原子关系信息"); return R.fail("未找到指标原子关系信息"); } + + List modelAtomicResultList = modelAtomicResultService.lambdaQuery().eq(ModelAtomicResult::getCaseId, caseId).list(); + log.info("开始计算指标结果"); // 遍历指标集合，处理每个指标的判断逻辑，得出结果 modelIndices.forEach(modelIndex -> { @@ -290,6 +294,10 @@ public class ModelServiceImpl implements ModelService { modelIndexResult.setId(exist.getId()); } modelIndexResult.setIndexResult(result ? "true" : "false"); + + // 先清除掉与指标失去关联的原子指标对应的结果 + removeAtomicResultWithNoReference(modelIndex.getId(), modelIndexAtomicRelations, modelAtomicResultList); + if (exist == null) { modelIndexResultMapper.insert(modelIndexResult); } else { @@ -313,6 +321,22 @@ public class ModelServiceImpl implements ModelService { return R.ok(); } + private void removeAtomicResultWithNoReference(String modelIndexId, List modelIndexAtomicRelations, + List modelAtomicResultList) { + List atomicIds = modelIndexAtomicRelations.stream() + .filter(relation -> StrUtil.equals(relation.getModelIndexId(), modelIndexId)) + .map(ModelIndexAtomicRelation::getAtomicIndexId).toList(); + + List modelAtomicResults = modelAtomicResultList.stream() + .filter(atomicResult -> StrUtil.equals(atomicResult.getIndexId(), modelIndexId) + && !atomicIds.contains(atomicResult.getAtomicId())).toList(); + + for (ModelAtomicResult modelAtomicResult : modelAtomicResults) { + log.info("删除无引用的原子指标结果，指标id:{},原子指标ID：{}", modelIndexId,modelAtomicResult.getAtomicId()); + modelAtomicResultMapper.deleteById(modelAtomicResult.getId()); + } + } + /** * 人工定义指标分析 * diff --git a/src/main/resources/mapper/ModelCaseMapper.xml b/src/main/resources/mapper/ModelCaseMapper.xml index 3513ded..ec17d34 100644 --- a/src/main/resources/mapper/ModelCaseMapper.xml +++ b/src/main/resources/mapper/ModelCaseMapper.xml @@ -128,6 +128,7 @@ and exists(select 1 from model_atomic_result mar + join model_index_atomic_relation iar on mar.index_id = iar.model_index_id and mar.atomic_id = iar.atomic_index_id left join note_record_split nrs on mar.record_split_id = nrs.id left join model_atomic_index mai on mar.atomic_id = mai.id where mar.case_id = #{query.caseId}