From bf59513d07b8c056e81364be13a321b354d74019 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Fri, 3 Apr 2026 10:03:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor(entrustment):=20=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E5=AF=BC=E5=85=A5=E5=92=8C=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除EntrustMaterialCheckoutResultController中未使用的dlpUser变量 - 移除EntrustmentController中未使用的RandomUtil导入和CaseEventVO类导入 - 省略CheckoutResultExcelDTO中未使用的LocalDate导入 - EntrustMaterialCheckoutResultServiceImpl中去除未使用的URLEncoder导入及多余空行 - ExcelOperationServiceImpl中替换通配符导入为具体实体类导入，优化代码整洁度 - 注释中调整身份证号业务校验描述，更准确反映逻辑 --- .../EntrustMaterialCheckoutResultController.java | 1 - .../entrustment/controller/EntrustmentController.java | 2 -- .../platform/entrustment/dto/CheckoutResultExcelDTO.java | 1 - .../impl/EntrustMaterialCheckoutResultServiceImpl.java | 2 -- .../service/impl/ExcelOperationServiceImpl.java | 7 +++++-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java index deebb38..2cd1b3f 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java @@ -101,7 +101,6 @@ public class EntrustMaterialCheckoutResultController { @GetMapping("/pushSuspectDetectionResult") @ApiOperation("推送检出结果") public R pushSuspectDetectionResult(String entrustId) throws SQLException { - DLPUser dlpUser = SecurityUtils.getUser(); return R.ok(entrustMaterialCheckoutResultService.pushSuspectDetectionResult(entrustId)); } diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java index d7ad696..1c87f6c 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java @@ -2,7 +2,6 @@ package digital.laboratory.platform.entrustment.controller; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.amazonaws.services.s3.model.AmazonS3Exception; @@ -26,7 +25,6 @@ import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.service.CaseEventService; import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService; import digital.laboratory.platform.entrustment.service.EntrustmentService; -import digital.laboratory.platform.entrustment.vo.CaseEventVO; import digital.laboratory.platform.entrustment.vo.EntrustmentVO; import digital.laboratory.platform.sys.dto.entrustment.CommonIdDto; import digital.laboratory.platform.sys.entity.SysUser; diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java index c2a5e3c..6d46834 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; @Data diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java index 5af51a7..78de164 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java @@ -52,7 +52,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; -import java.net.URLEncoder; import java.sql.*; import java.time.*; import java.time.format.DateTimeFormatter; @@ -1940,7 +1939,6 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl>> map = this.generateQuarterlyReportData(dto.getYear(), dto.getQuarterlyList()); diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/ExcelOperationServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/ExcelOperationServiceImpl.java index 4531b5e..b2ef98b 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/ExcelOperationServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/ExcelOperationServiceImpl.java @@ -10,7 +10,10 @@ import digital.laboratory.platform.common.core.exception.CheckedException; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; import digital.laboratory.platform.common.security.util.SecurityUtils; -import digital.laboratory.platform.entrustment.entity.*; +import digital.laboratory.platform.entrustment.entity.CaseEvent; +import digital.laboratory.platform.entrustment.entity.Entrustment; +import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; +import digital.laboratory.platform.entrustment.entity.Suspect; import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums; import digital.laboratory.platform.entrustment.enums.EntrustExportHeaderEnum; import digital.laboratory.platform.entrustment.enums.EntrustIdentificationSituationType; @@ -451,7 +454,7 @@ public class ExcelOperationServiceImpl implements ExcelOperationService { // 3. 身份证号业务校验 // 条件：生物样本(Type=1) 且 属于指定的鉴定结果类别 -// 3. 身份证号业务校验及一致性比对 + // 3. 身份证号业务校验及一致性比对 if (entrustment.getEntrustmentType() == 1 && idCardRequiredResults.contains(entrustment.getOldIdentificationResult())) { String idCard = datum.get("身份证号"); if (StrUtil.isBlank(idCard)) {