From 02105eea2a3c25e719992a079ff96a7f5e5eede4 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 30 Jul 2024 10:49:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/supervision/constant/ScoreEnum.java | 4 ++-- .../java/com/supervision/police/domain/ModelCase.java | 6 ++++++ .../police/dto/caseScore/CaseScoreDetailBuilder.java | 10 ++++++++-- .../police/dto/caseScore/CaseScoreDetailDTO.java | 6 ++++++ .../service/impl/CaseStatusManageServiceImpl.java | 5 ++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/supervision/constant/ScoreEnum.java b/src/main/java/com/supervision/constant/ScoreEnum.java index 7fe5e8d..053c3d0 100644 --- a/src/main/java/com/supervision/constant/ScoreEnum.java +++ b/src/main/java/com/supervision/constant/ScoreEnum.java @@ -3,9 +3,9 @@ package com.supervision.constant; import java.util.Objects; public enum ScoreEnum { - EVIDENCE_NOT_FULL("1","证据不足", "司法机关对案件形成一致认定意见的概率比较大"), + EVIDENCE_NOT_FULL("1","证据不足", "司法籍贯会作出绝对不起诉或存疑不起诉的决定"), EVIDENCE_LACK("2","事实不清", "司法籍贯认定意见不一致的概率比较大"), - EVIDENCE_FULL("3","证据充分", "司法籍贯会作出绝对不起诉或存疑不起诉的决定"); + EVIDENCE_FULL("3","证据充分", "司法机关对案件形成一致认定意见的概率比较大"); private final String code; private final String name; diff --git a/src/main/java/com/supervision/police/domain/ModelCase.java b/src/main/java/com/supervision/police/domain/ModelCase.java index f94a0a8..39da9d2 100644 --- a/src/main/java/com/supervision/police/domain/ModelCase.java +++ b/src/main/java/com/supervision/police/domain/ModelCase.java @@ -115,6 +115,12 @@ public class ModelCase implements Serializable { @TableField(exist=false) @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime updateEndTime; + + /** + * 分析成功时间 + */ + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime caseAnalysisSuccessTime; /** * 数据状态 diff --git a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java index a43ba21..1a55ed7 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java @@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.ai.ollama.OllamaChatClient; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,6 +29,10 @@ public class CaseScoreDetailBuilder { @Schema(description = "案件名称") private String caseName; + @Schema(description = "评估时间") + private LocalDateTime evaluationTime; + + @Schema(description = "当事人列表") private List lawPartyList; @@ -149,13 +154,14 @@ public class CaseScoreDetailBuilder { CaseScoreDetailDTO caseScoreDetailDTO = new CaseScoreDetailDTO(); caseScoreDetailDTO.setCaseName(this.caseName); + caseScoreDetailDTO.setEvaluationTime(this.evaluationTime); caseScoreDetailDTO.setCommonScore(this.getCommonScore()); Integer crimeScore = this.getCrimeScore(); Integer crimeOutScore = this.getCrimeOutScore(); caseScoreDetailDTO.setSpecificCrimeScore(crimeScore < crimeOutScore? crimeOutScore:crimeScore); - caseScoreDetailDTO.setTotalScore(crimeScore + crimeOutScore); int sumScore = caseScoreDetailDTO.getCommonScore() + caseScoreDetailDTO.getSpecificCrimeScore(); + caseScoreDetailDTO.setTotalScore(sumScore); ScoreEnum scoreEnum = ScoreEnum.getScoreEnum(sumScore); if (scoreEnum != null){ caseScoreDetailDTO.setScoreDesc(scoreEnum.getDesc()); @@ -258,7 +264,7 @@ public class CaseScoreDetailBuilder { ModelCase modelCase = modelCaseMapper.selectById(caseId); this.setCaseId(modelCase.getId()); this.setCaseName(modelCase.getCaseName()); - + this.setEvaluationTime(modelCase.getCaseAnalysisSuccessTime()); // 2 设置当事人人员信息 List casePersonList = casePersonMapper.selectList(new LambdaQueryWrapper().eq(CasePerson::getCaseId, caseId)); this.setLawActor(casePersonList); diff --git a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java index f6cf242..c767e47 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java @@ -2,10 +2,12 @@ package com.supervision.police.dto.caseScore; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import java.time.LocalDateTime; import java.util.List; @Data @@ -15,6 +17,10 @@ public class CaseScoreDetailDTO { @Schema(description = "案件名称") private String caseName; + @Schema(description = "评估时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime evaluationTime; + @Schema(description = "共性指标分数") private Integer commonScore; diff --git a/src/main/java/com/supervision/police/service/impl/CaseStatusManageServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseStatusManageServiceImpl.java index 46b0768..0e9b294 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseStatusManageServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseStatusManageServiceImpl.java @@ -15,6 +15,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; + @Slf4j @Service @RequiredArgsConstructor @@ -90,7 +92,8 @@ public class CaseStatusManageServiceImpl implements CaseStatusManageService { .set(ModelCase::getCaseAnalysisStatus, CaseAnalysisStatusEnum.ANALYZED.getCode()) .set(ModelCase::getCaseDataStatus, CaseDataStatusEnum.NOT_UPDATE.getCode()) .set(ModelCase::getTotalScore, score) - .set(ModelCase::getIdentifyResult, ScoreEnum.getScoreEnum(score).getCode())); + .set(ModelCase::getIdentifyResult, ScoreEnum.getScoreEnum(score).getCode()) + .set(ModelCase::getCaseAnalysisSuccessTime, LocalDateTime.now())); } @Override