1. 优化代码

topo_dev
xueqingkun 9 months ago
parent 89b90fce22
commit 02105eea2a

@ -3,9 +3,9 @@ package com.supervision.constant;
import java.util.Objects; import java.util.Objects;
public enum ScoreEnum { public enum ScoreEnum {
EVIDENCE_NOT_FULL("1","证据不足", "司法机关对案件形成一致认定意见的概率比较大"), EVIDENCE_NOT_FULL("1","证据不足", "司法籍贯会作出绝对不起诉或存疑不起诉的决定"),
EVIDENCE_LACK("2","事实不清", "司法籍贯认定意见不一致的概率比较大"), EVIDENCE_LACK("2","事实不清", "司法籍贯认定意见不一致的概率比较大"),
EVIDENCE_FULL("3","证据充分", "司法籍贯会作出绝对不起诉或存疑不起诉的决定"); EVIDENCE_FULL("3","证据充分", "司法机关对案件形成一致认定意见的概率比较大");
private final String code; private final String code;
private final String name; private final String name;

@ -115,6 +115,12 @@ public class ModelCase implements Serializable {
@TableField(exist=false) @TableField(exist=false)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime updateEndTime; private LocalDateTime updateEndTime;
/**
*
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime caseAnalysisSuccessTime;
/** /**
* *

@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.springframework.ai.ollama.OllamaChatClient; import org.springframework.ai.ollama.OllamaChatClient;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -28,6 +29,10 @@ public class CaseScoreDetailBuilder {
@Schema(description = "案件名称") @Schema(description = "案件名称")
private String caseName; private String caseName;
@Schema(description = "评估时间")
private LocalDateTime evaluationTime;
@Schema(description = "当事人列表") @Schema(description = "当事人列表")
private List<LawParty> lawPartyList; private List<LawParty> lawPartyList;
@ -149,13 +154,14 @@ public class CaseScoreDetailBuilder {
CaseScoreDetailDTO caseScoreDetailDTO = new CaseScoreDetailDTO(); CaseScoreDetailDTO caseScoreDetailDTO = new CaseScoreDetailDTO();
caseScoreDetailDTO.setCaseName(this.caseName); caseScoreDetailDTO.setCaseName(this.caseName);
caseScoreDetailDTO.setEvaluationTime(this.evaluationTime);
caseScoreDetailDTO.setCommonScore(this.getCommonScore()); caseScoreDetailDTO.setCommonScore(this.getCommonScore());
Integer crimeScore = this.getCrimeScore(); Integer crimeScore = this.getCrimeScore();
Integer crimeOutScore = this.getCrimeOutScore(); Integer crimeOutScore = this.getCrimeOutScore();
caseScoreDetailDTO.setSpecificCrimeScore(crimeScore < crimeOutScore? crimeOutScore:crimeScore); caseScoreDetailDTO.setSpecificCrimeScore(crimeScore < crimeOutScore? crimeOutScore:crimeScore);
caseScoreDetailDTO.setTotalScore(crimeScore + crimeOutScore);
int sumScore = caseScoreDetailDTO.getCommonScore() + caseScoreDetailDTO.getSpecificCrimeScore(); int sumScore = caseScoreDetailDTO.getCommonScore() + caseScoreDetailDTO.getSpecificCrimeScore();
caseScoreDetailDTO.setTotalScore(sumScore);
ScoreEnum scoreEnum = ScoreEnum.getScoreEnum(sumScore); ScoreEnum scoreEnum = ScoreEnum.getScoreEnum(sumScore);
if (scoreEnum != null){ if (scoreEnum != null){
caseScoreDetailDTO.setScoreDesc(scoreEnum.getDesc()); caseScoreDetailDTO.setScoreDesc(scoreEnum.getDesc());
@ -258,7 +264,7 @@ public class CaseScoreDetailBuilder {
ModelCase modelCase = modelCaseMapper.selectById(caseId); ModelCase modelCase = modelCaseMapper.selectById(caseId);
this.setCaseId(modelCase.getId()); this.setCaseId(modelCase.getId());
this.setCaseName(modelCase.getCaseName()); this.setCaseName(modelCase.getCaseName());
this.setEvaluationTime(modelCase.getCaseAnalysisSuccessTime());
// 2 设置当事人人员信息 // 2 设置当事人人员信息
List<CasePerson> casePersonList = casePersonMapper.selectList(new LambdaQueryWrapper<CasePerson>().eq(CasePerson::getCaseId, caseId)); List<CasePerson> casePersonList = casePersonMapper.selectList(new LambdaQueryWrapper<CasePerson>().eq(CasePerson::getCaseId, caseId));
this.setLawActor(casePersonList); this.setLawActor(casePersonList);

@ -2,10 +2,12 @@ package com.supervision.police.dto.caseScore;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Data @Data
@ -15,6 +17,10 @@ public class CaseScoreDetailDTO {
@Schema(description = "案件名称") @Schema(description = "案件名称")
private String caseName; private String caseName;
@Schema(description = "评估时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime evaluationTime;
@Schema(description = "共性指标分数") @Schema(description = "共性指标分数")
private Integer commonScore; private Integer commonScore;

@ -15,6 +15,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@ -90,7 +92,8 @@ public class CaseStatusManageServiceImpl implements CaseStatusManageService {
.set(ModelCase::getCaseAnalysisStatus, CaseAnalysisStatusEnum.ANALYZED.getCode()) .set(ModelCase::getCaseAnalysisStatus, CaseAnalysisStatusEnum.ANALYZED.getCode())
.set(ModelCase::getCaseDataStatus, CaseDataStatusEnum.NOT_UPDATE.getCode()) .set(ModelCase::getCaseDataStatus, CaseDataStatusEnum.NOT_UPDATE.getCode())
.set(ModelCase::getTotalScore, score) .set(ModelCase::getTotalScore, score)
.set(ModelCase::getIdentifyResult, ScoreEnum.getScoreEnum(score).getCode())); .set(ModelCase::getIdentifyResult, ScoreEnum.getScoreEnum(score).getCode())
.set(ModelCase::getCaseAnalysisSuccessTime, LocalDateTime.now()));
} }
@Override @Override

Loading…
Cancel
Save