Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(entrustment): 清理未使用导入和无用代码

Browse Source 
- 删除EntrustMaterialCheckoutResultController中未使用的dlpUser变量
- 移除EntrustmentController中未使用的RandomUtil导入和CaseEventVO类导入
- 省略CheckoutResultExcelDTO中未使用的LocalDate导入
- EntrustMaterialCheckoutResultServiceImpl中去除未使用的URLEncoder导入及多余空行
- ExcelOperationServiceImpl中替换通配符导入为具体实体类导入，优化代码整洁度
- 注释中调整身份证号业务校验描述，更准确反映逻辑
This commit is contained in:
陈江保
2026-04-03 10:03:10 +08:00
parent d0bbd4b023
commit bf59513d07
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
View File

@@ -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));
}

2
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
View File

@@ -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;

1
src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java
View File

@@ -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

2
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
View File

@@ -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<Entrus
return statistics;
}
@Override
public String generateQuarterlyReportExcel(GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException {
HashMap<Integer, Map<String, List<Integer>>> map = this.generateQuarterlyReportData(dto.getYear(), dto.getQuarterlyList());

7
src/main/java/digital/laboratory/platform/entrustment/service/impl/ExcelOperationServiceImpl.java
View File

@@ -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)) {