From 11cccddf639509e48cc40016d6cd6e69b8715a59 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 1 Aug 2024 14:34:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ModelCaseController.java | 7 ++- .../police/dto/AtomicIndexDTO.java | 18 ++++++ .../supervision/police/dto/ModelCaseBase.java | 59 +++++++++++++++++++ .../police/service/ModelCaseService.java | 3 +- .../service/impl/ModelCaseServiceImpl.java | 5 +- src/main/resources/mapper/ModelCaseMapper.xml | 2 +- 6 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/supervision/police/dto/ModelCaseBase.java diff --git a/src/main/java/com/supervision/police/controller/ModelCaseController.java b/src/main/java/com/supervision/police/controller/ModelCaseController.java index 07fb437..7f69437 100644 --- a/src/main/java/com/supervision/police/controller/ModelCaseController.java +++ b/src/main/java/com/supervision/police/controller/ModelCaseController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.common.domain.R; import com.supervision.police.domain.CasePerson; import com.supervision.police.domain.ModelCase; +import com.supervision.police.dto.ModelCaseBase; import com.supervision.police.dto.ModelCaseDTO; import com.supervision.police.service.ModelCaseService; import io.swagger.v3.oas.annotations.Operation; @@ -52,12 +53,12 @@ public class ModelCaseController { /** * 新增或修改 - * @param modelCase + * @param modelCaseBase * @return */ @PostMapping("/addOrUpd") - public R addOrUpd(@RequestBody ModelCase modelCase) { - return modelCaseService.addOrUpd(modelCase); + public R addOrUpd(@RequestBody ModelCaseBase modelCaseBase) { + return modelCaseService.addOrUpd(modelCaseBase); } /** diff --git a/src/main/java/com/supervision/police/dto/AtomicIndexDTO.java b/src/main/java/com/supervision/police/dto/AtomicIndexDTO.java index afdd698..8e323d6 100644 --- a/src/main/java/com/supervision/police/dto/AtomicIndexDTO.java +++ b/src/main/java/com/supervision/police/dto/AtomicIndexDTO.java @@ -1,7 +1,11 @@ package com.supervision.police.dto; +import com.supervision.constant.JudgeResultEnum; +import com.supervision.constant.ScoreEnum; import lombok.Data; +import java.util.Objects; + @Data public class AtomicIndexDTO { @@ -25,4 +29,18 @@ public class AtomicIndexDTO { */ private String record; + /** + * 原子指标结果 + */ + private String atomicResult; + + + public void atomicResultToIndexResult() { + JudgeResultEnum instance = JudgeResultEnum.getInstance(this.atomicResult); + if (Objects.isNull(instance)){ + this.indexResult = "false"; + } + this.indexResult = instance.flagIsTrue() ? "true" : "false"; + } + } diff --git a/src/main/java/com/supervision/police/dto/ModelCaseBase.java b/src/main/java/com/supervision/police/dto/ModelCaseBase.java new file mode 100644 index 0000000..369d66a --- /dev/null +++ b/src/main/java/com/supervision/police/dto/ModelCaseBase.java @@ -0,0 +1,59 @@ +package com.supervision.police.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.supervision.police.domain.ModelCase; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.util.Date; + +@Data +public class ModelCaseBase { + + @Schema(description = "主键id") + private String id; + + @Schema(description = "案件名称") + private String caseName; + + @Schema(description = "案件类型") + private String caseType; + + @Schema(description = "案件状态") + private String caseStatus; + + @Schema(description = "作案方式") + private String crimeMode; + + @Schema(description = "案件概述") + private String caseDetail; + + @Schema(description = "立案时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date registerTime; + + @Schema(description = "受理时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date acceptTime; + + @Schema(description = "排序序号") + private Integer indexNum; + + @Schema(description = "案件编号") + private String caseNo; + + public ModelCase toModelCase() { + ModelCase modelCase = new ModelCase(); + modelCase.setId(this.id); + modelCase.setCaseName(this.caseName); + modelCase.setCaseType(this.caseType); + modelCase.setCaseStatus(this.caseStatus); + modelCase.setCrimeMode(this.crimeMode); + modelCase.setCaseDetail(this.caseDetail); + modelCase.setRegisterTime(this.registerTime); + modelCase.setAcceptTime(this.acceptTime); + modelCase.setIndexNum(this.indexNum); + modelCase.setCaseNo(this.caseNo); + return modelCase; + } + +} diff --git a/src/main/java/com/supervision/police/service/ModelCaseService.java b/src/main/java/com/supervision/police/service/ModelCaseService.java index 27e45c3..c3bcde0 100644 --- a/src/main/java/com/supervision/police/service/ModelCaseService.java +++ b/src/main/java/com/supervision/police/service/ModelCaseService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.supervision.common.domain.R; import com.supervision.police.domain.CasePerson; import com.supervision.police.domain.ModelCase; +import com.supervision.police.dto.ModelCaseBase; import com.supervision.police.dto.ModelCaseDTO; import org.springframework.web.multipart.MultipartFile; @@ -22,7 +23,7 @@ public interface ModelCaseService extends IService { R checkCaseNo(String caseNo,String caseId); - R addOrUpd(ModelCase modelCase); + R addOrUpd(ModelCaseBase modelCaseBase); R del(String id); 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 d249275..eb89a71 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java @@ -20,6 +20,7 @@ import com.supervision.police.domain.CasePerson; import com.supervision.police.domain.ComDictionary; import com.supervision.police.dto.AtomicIndexDTO; import com.supervision.police.dto.IndexDetail; +import com.supervision.police.dto.ModelCaseBase; import com.supervision.police.dto.ModelCaseDTO; import com.supervision.police.mapper.CasePersonMapper; import com.supervision.police.mapper.ModelCaseMapper; @@ -128,8 +129,9 @@ public class ModelCaseServiceImpl extends ServiceImpl addOrUpd(ModelCase modelCase) { + public R addOrUpd(ModelCaseBase modelCaseBase) { int i = 0; + ModelCase modelCase = modelCaseBase.toModelCase(); if (modelCase.getId() != null) { i = modelCaseMapper.updateById(modelCase); } else { @@ -263,6 +265,7 @@ public class ModelCaseServiceImpl extends ServiceImpl atomicIds = Arrays.asList(array); List atomics = modelCaseMapper.getAtomicDetail(caseId, atomicIds); + atomics.forEach(AtomicIndexDTO::atomicResultToIndexResult); record.setChildren(atomics); } iPage.setRecords(records); diff --git a/src/main/resources/mapper/ModelCaseMapper.xml b/src/main/resources/mapper/ModelCaseMapper.xml index b44a8f2..da0fc2f 100644 --- a/src/main/resources/mapper/ModelCaseMapper.xml +++ b/src/main/resources/mapper/ModelCaseMapper.xml @@ -47,7 +47,7 @@