From 8513c7c590f47ad6c4c9d4db620a6f1cb3728e16 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 19 Feb 2025 12:30:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E5=A4=9A=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=8E=A5=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScoringModelInfoController.java | 4 +-- .../police/domain/EvidenceCategory.java | 3 +- .../service/ModelAtomicResultService.java | 3 ++ .../service/ModelIndexResultService.java | 8 +++++ .../service/ScoringModelInfoService.java | 2 +- .../impl/EvidenceCategoryServiceImpl.java | 8 +++-- .../impl/ModelAtomicResultServiceImpl.java | 6 ++++ .../service/impl/ModelCaseServiceImpl.java | 19 +++++++++-- .../impl/ModelIndexResultServiceImpl.java | 19 +++++++++++ .../service/impl/NotePromptServiceImpl.java | 3 +- .../impl/ScoringModelInfoServiceImpl.java | 32 +++++++++++-------- 11 files changed, 84 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/supervision/police/service/ModelIndexResultService.java create mode 100644 src/main/java/com/supervision/police/service/impl/ModelIndexResultServiceImpl.java diff --git a/src/main/java/com/supervision/police/controller/ScoringModelInfoController.java b/src/main/java/com/supervision/police/controller/ScoringModelInfoController.java index 3b67bde..a7db489 100644 --- a/src/main/java/com/supervision/police/controller/ScoringModelInfoController.java +++ b/src/main/java/com/supervision/police/controller/ScoringModelInfoController.java @@ -42,7 +42,7 @@ public class ScoringModelInfoController { @Operation(summary = "复制赋分模型") @PostMapping("/copy") public R copyScoringModel(@RequestBody ScoringModelInfo modelInfo) { - String modelId = scoringModelInfoService.copyScoringModel(modelInfo.getId()); + String modelId = scoringModelInfoService.copyScoringModel(modelInfo); return R.ok(modelId); } @@ -50,7 +50,7 @@ public class ScoringModelInfoController { @GetMapping("/pageList") public R> pageList(@RequestParam(required = false) @Parameter(name = "modelName",description = "模型名称") String modelName, @RequestParam(defaultValue = "1") @Parameter(name = "pageNum",description = "页码") Integer pageNum, - @RequestParam(defaultValue = "10") @Parameter(name = "pageSize",description = "每页数量") Integer pageSize) { + @RequestParam(defaultValue = "99999") @Parameter(name = "pageSize",description = "每页数量") Integer pageSize) { IPage page = scoringModelInfoService.pageList(modelName,pageNum, pageSize); return R.ok(page); } diff --git a/src/main/java/com/supervision/police/domain/EvidenceCategory.java b/src/main/java/com/supervision/police/domain/EvidenceCategory.java index 82d32f9..609e103 100644 --- a/src/main/java/com/supervision/police/domain/EvidenceCategory.java +++ b/src/main/java/com/supervision/police/domain/EvidenceCategory.java @@ -8,6 +8,7 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; +import static com.baomidou.mybatisplus.annotation.IdType.INPUT; /** * 证据类别表 @@ -20,7 +21,7 @@ public class EvidenceCategory implements Serializable { /** * 主键id */ - @TableId + @TableId(type = INPUT) private String id; /** diff --git a/src/main/java/com/supervision/police/service/ModelAtomicResultService.java b/src/main/java/com/supervision/police/service/ModelAtomicResultService.java index 5a5ee1e..5a09a0b 100644 --- a/src/main/java/com/supervision/police/service/ModelAtomicResultService.java +++ b/src/main/java/com/supervision/police/service/ModelAtomicResultService.java @@ -8,4 +8,7 @@ import java.util.List; public interface ModelAtomicResultService extends IService { List queryByCaseIdForUpdate(String caseId); + + + void replaceResultCaseId(String oldCaseId, String newCaseId); } diff --git a/src/main/java/com/supervision/police/service/ModelIndexResultService.java b/src/main/java/com/supervision/police/service/ModelIndexResultService.java new file mode 100644 index 0000000..49aad33 --- /dev/null +++ b/src/main/java/com/supervision/police/service/ModelIndexResultService.java @@ -0,0 +1,8 @@ +package com.supervision.police.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.police.domain.ModelIndexResult; +public interface ModelIndexResultService extends IService { + + void removeByCaseId(String caseId); +} diff --git a/src/main/java/com/supervision/police/service/ScoringModelInfoService.java b/src/main/java/com/supervision/police/service/ScoringModelInfoService.java index 8d3cbb1..ca85c1e 100644 --- a/src/main/java/com/supervision/police/service/ScoringModelInfoService.java +++ b/src/main/java/com/supervision/police/service/ScoringModelInfoService.java @@ -20,7 +20,7 @@ public interface ScoringModelInfoService extends IService { void updateScoringModel(ScoringModelInfo modelInfo); - String copyScoringModel(String modelId); + String copyScoringModel(ScoringModelInfo modelInfo); IPage pageList(String modelName, Integer pageNum, Integer pageSize); diff --git a/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java b/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java index 3edd781..48af95b 100644 --- a/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java @@ -12,7 +12,6 @@ import com.supervision.police.service.NotePromptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -27,10 +26,15 @@ public class EvidenceCategoryServiceImpl extends ServiceImpl listCategoryTree(String caseType) { - List list = super.getBaseMapper().listCategoryDTO(caseType); + List list = super.getBaseMapper().listCategoryDTO(null); List notePrompts = notePromptService.list(); for (EvidenceCategoryDTO categoryDTO : list) { List child = list.stream() diff --git a/src/main/java/com/supervision/police/service/impl/ModelAtomicResultServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelAtomicResultServiceImpl.java index 8f98f67..686e26d 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelAtomicResultServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelAtomicResultServiceImpl.java @@ -17,4 +17,10 @@ public class ModelAtomicResultServiceImpl extends ServiceImpl queryByCaseIdForUpdate(String caseId) { return super.getBaseMapper().queryByCaseIdForUpdate(caseId); } + + @Override + public void replaceResultCaseId(String oldCaseId, String newCaseId) { + super.lambdaUpdate().eq(ModelAtomicResult::getCaseId, oldCaseId) + .set(ModelAtomicResult::getCaseId, newCaseId).update(); + } } diff --git a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java index bafec97..922ada8 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java @@ -60,10 +60,10 @@ public class ModelCaseServiceImpl extends ServiceImpl>> persionMap = casePersonList.stream().collect(Collectors.groupingBy(CasePerson::getCaseId, Collectors.groupingBy(person -> NumberUtil.equals(person.getCaseActorFlag(), 1) ? "1" : "2"))); List dicts = comDictionaryService.list(); + List scoringModelInfos = modelInfoService.list(); return modelCaseIPage.convert(modelCaseInfo -> { ModelCaseDTO modelCaseDTO = BeanUtil.toBean(modelCaseInfo, ModelCaseDTO.class, CopyOptions.create().setIgnoreProperties("lawActor")); String[] caseTypes = modelCaseDTO.getCaseType().split(","); List caseType = new ArrayList<>(); for (String type : caseTypes) { - caseType.add(comDictionaryService.getName(dicts, "case_type", type)); + caseType.add(modelInfoService.getScoringModelNameById(type, scoringModelInfos)); } if (StrUtil.isEmpty(modelCaseDTO.getCaseStatus())) { modelCaseDTO.setCaseStatus("1"); @@ -163,6 +167,15 @@ public class ModelCaseServiceImpl extends ServiceImpl + implements ModelIndexResultService { + + @Override + public void removeByCaseId(String caseId) { + Assert.notEmpty(caseId, "案件id不能为空"); + super.lambdaUpdate().eq(ModelIndexResult::getCaseId, caseId).remove(); + } +} diff --git a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java index 68c7950..5ca3721 100644 --- a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java @@ -46,7 +46,8 @@ import static com.supervision.police.service.impl.ModelRecordTypeServiceImpl.bui @RequiredArgsConstructor public class NotePromptServiceImpl extends ServiceImpl implements NotePromptService { - private final NoteRecordSplitService noteRecordSplitService; + @Autowired + private NoteRecordSplitService noteRecordSplitService; @Autowired private ModelRecordTypeService modelRecordTypeService; diff --git a/src/main/java/com/supervision/police/service/impl/ScoringModelInfoServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ScoringModelInfoServiceImpl.java index 0c241a0..54f13c1 100644 --- a/src/main/java/com/supervision/police/service/impl/ScoringModelInfoServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ScoringModelInfoServiceImpl.java @@ -7,12 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.police.domain.ScoringModelInfo; -import com.supervision.police.service.ModelCaseService; -import com.supervision.police.service.ModelIndexService; -import com.supervision.police.service.ScoringModelInfoService; +import com.supervision.police.service.*; import com.supervision.police.mapper.ScoringModelInfoMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,9 +28,14 @@ import java.util.List; public class ScoringModelInfoServiceImpl extends ServiceImpl implements ScoringModelInfoService{ - private final ModelCaseService modelCaseService; + @Autowired + private ModelCaseService modelCaseService; - private final ModelIndexService modelIndexService; + @Autowired + private ModelIndexService modelIndexService; + + @Autowired + private final EvidenceCategoryService evidenceCategoryService; @Override public String saveScoringModel(ScoringModelInfo modelInfo) { Assert.notEmpty(modelInfo.getModelName(), "模型名不能为空"); @@ -70,12 +74,15 @@ public class ScoringModelInfoServiceImpl extends ServiceImpl