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

202501009 更新

Browse Source 
1.新增可导出上传至禁毒大数据平台文件
This commit is contained in:
陈江保
2025-10-09 15:08:00 +08:00
parent e70c1c0b3c
commit 8502fa3b35
16 changed files with 104 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
package digital.laboratory.platform.entrustment.controller;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import digital.laboratory.platform.common.core.exception.CheckedException;
@@ -11,11 +10,9 @@ import digital.laboratory.platform.entrustment.convert.EntrustMaterialCheckoutRe
import digital.laboratory.platform.entrustment.dto.EntrustMaterialCheckoutResultDTO;
import digital.laboratory.platform.entrustment.dto.GenerateQuarterlyReportDTO;
import digital.laboratory.platform.entrustment.dto.ResultExcelDTO;
import digital.laboratory.platform.entrustment.query.BaseQuery;
import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery;
import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService;
import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -26,11 +23,8 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.sql.Array;
import java.sql.SQLException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
* 委托检材--检出定性定量结果信息

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

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import digital.laboratory.platform.common.aop.annotation.DlpAccessLimit;
import digital.laboratory.platform.common.aop.annotation.DlpRepeatSubmit;
import digital.laboratory.platform.common.core.constant.OSSDirectoryConstants;
import digital.laboratory.platform.common.core.exception.CheckedException;
@@ -21,7 +20,6 @@ import digital.laboratory.platform.common.oss.service.OssFile;
import digital.laboratory.platform.common.security.annotation.Inner;
import digital.laboratory.platform.common.security.util.SecurityUtils;
import digital.laboratory.platform.entrustment.dto.EntrustmentDTO;
import digital.laboratory.platform.entrustment.dto.MaterialDTO;
import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;

3
src/main/java/digital/laboratory/platform/entrustment/controller/ExcelOperationController.java
View File

@@ -4,9 +4,6 @@ import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.entrustment.service.ExcelOperationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

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

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;

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

@@ -2,7 +2,6 @@ package digital.laboratory.platform.entrustment.dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class GenerateQuarterlyReportDTO {

25
src/main/java/digital/laboratory/platform/entrustment/dto/ResultExcelDTO.java
View File

@@ -1,20 +1,31 @@
package digital.laboratory.platform.entrustment.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class
@ApiModel(value = "ResultExcelDTO对象", description = "导出检材信息excel的参数")
public class ResultExcelDTO {
@ApiModelProperty(value = "委托类型")
private Integer entrustType;
@ApiModelProperty(value = "鉴定情况")
private List<String> oldResult;
@ApiModelProperty(value = "开始时间")
private LocalDateTime startTime;
ResultExcelDTO {
Integer entrustType;
List<String> oldResult;
LocalDateTime startTime;
LocalDateTime endTime;
Boolean isMetabolite;
@ApiModelProperty(value = "结束时间")
private LocalDateTime endTime;
@ApiModelProperty(value = "是否代谢物")
private Boolean isMetabolite;
@ApiModelProperty(value = "是否导出可上传至禁毒大数据平台文件")
private Boolean exportForBigDataPlatform;
}

2
src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialCheckoutResult.java
View File

@@ -31,7 +31,7 @@ public class EntrustMaterialCheckoutResult extends BaseEntity {
private String qualitativeResult;
/**
* 定量结果
* 定量结果，多个则是通过 、分隔
*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String quantitativeResult;

1
src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java
View File

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;

1
src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java
View File

@@ -13,7 +13,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang.StringUtils;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;

3
src/main/java/digital/laboratory/platform/entrustment/mapper/SuspectMapper.java
View File

@@ -3,11 +3,10 @@ package digital.laboratory.platform.entrustment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.entrustment.entity.Suspect;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* 委托嫌疑人数据访问接口
*/
@Mapper
public interface SuspectMapper extends BaseMapper<Suspect> {
}
}

17
src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java
View File

@@ -14,16 +14,13 @@ import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResu
import digital.laboratory.platform.entrustment.vo.DetectionRateVO;
import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO;
import digital.laboratory.platform.entrustment.vo.SuspectDetectionVO;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.sql.SQLException;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author ChenJiangBao
@@ -49,12 +46,12 @@ public interface EntrustMaterialCheckoutResultService extends IService<EntrustMa
boolean save(EntrustMaterialCheckoutResultDTO dto);
/**
* 根据委托id导出检出结果excel文件
* 导出可上传至禁毒大数据平台文件
*
* @param entrustIds 委托id列表，包含需要导出的委托的id
* @param excelDTO 导出参数
* @param response HttpServletResponse对象，用于将生成的excel文件写入响应中
*/
void exportExcel(List<String> entrustIds, HttpServletResponse response) throws IOException;
void exportForBigDataPlatform(ResultExcelDTO excelDTO, HttpServletResponse response) throws IOException;
/**
* vo 分页对象
@@ -84,7 +81,13 @@ public interface EntrustMaterialCheckoutResultService extends IService<EntrustMa
*/
DetectionRateVO getDetectionRateByMaterial(Integer year, String orgId);
/**
* 导出Excel
* @param response
* @param excelDTO
* @return
* @throws IOException
*/
R getExcelByResult(HttpServletResponse response, ResultExcelDTO excelDTO) throws IOException;
boolean pushSuspectDetectionResult(String entrustmentId) throws SQLException;

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

@@ -26,7 +26,6 @@ import digital.laboratory.platform.entrustment.dto.ResultExcelDTO;
import digital.laboratory.platform.entrustment.entity.*;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.mapper.EntrustMaterialCheckoutResultMapper;
import digital.laboratory.platform.entrustment.mapper.EntrustmentIdentificationMaterialMapper;
import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery;
import digital.laboratory.platform.entrustment.service.*;
import digital.laboratory.platform.entrustment.utils.ExcelUtils;
@@ -82,9 +81,6 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
@Resource
private CommonFeignService commonFeignService;
@Resource
private EntrustmentIdentificationMaterialMapper entrustmentIdentificationMaterialMapper;
@Resource
private SuspectService suspectService;
@@ -190,17 +186,23 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
}
/**
* 根据委托id导出检出结果excel文件
* 导出可上传至禁毒大数据平台文件
*
* @param entrustIds 委托id列表，包含需要导出的委托的id
* @param excelDTO 导出参数
* @param response HttpServletResponse对象，用于将生成的excel文件写入响应中
*/
@Override
public void exportExcel(List<String> entrustIds, HttpServletResponse response) throws IOException {
public void exportForBigDataPlatform(ResultExcelDTO excelDTO, HttpServletResponse response) throws IOException {
// 获取委托信息
List<String> allResults = getOriginalIdentificationList(excelDTO.getOldResult());
List<Entrustment> entrustmentList = entrustmentService.list(
Wrappers.<Entrustment>lambdaQuery().in(Entrustment::getId, entrustIds)
Wrappers.<Entrustment>lambdaQuery()
.eq(excelDTO.getEntrustType() != null, Entrustment::getEntrustmentType, excelDTO.getEntrustType())
.in(CollUtil.isNotEmpty(allResults), Entrustment::getOldIdentificationResult, allResults)
.ge(excelDTO.getStartTime() != null, Entrustment::getAcceptTime, excelDTO.getStartTime())
.le(excelDTO.getEndTime() != null, Entrustment::getAcceptTime, excelDTO.getEndTime())
);
List<String> entrustIds = entrustmentList.stream().map(Entrustment::getId).collect(Collectors.toList());
// 获取检材信息， 排序的原因是需要数据是有序的
List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService.list(
Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
@@ -251,25 +253,6 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
*/
@Override
public IPage<EntrustMaterialCheckoutResultVO> voiPage(EntrustMaterialCheckoutResultQuery query) {
// IPage<EntrustMaterialCheckoutResult> page = this.page(
// new Page<>(query.getCurrent(), query.getSize()),
// Wrappers.<EntrustMaterialCheckoutResult>lambdaQuery()
// .eq(StrUtil.isNotBlank(query.getEntrustId()), EntrustMaterialCheckoutResult::getEntrustId, query.getEntrustId())
// .orderByDesc(EntrustMaterialCheckoutResult::getUpdateTime)
// );
// IPage<EntrustMaterialCheckoutResultVO> voPage = new Page<>();
// BeanUtils.copyProperties(page, voPage, "records");
// List<EntrustMaterialCheckoutResult> records = page.getRecords();
// if (CollUtil.isNotEmpty(records)) {
// List<EntrustmentIdentificationMaterial> entrustmentIdentificationMaterials = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery().in(EntrustmentIdentificationMaterial::getId, records.stream().map(EntrustMaterialCheckoutResult::getId).collect(Collectors.toSet())));
// Map<String, EntrustmentIdentificationMaterial> materialMap = entrustmentIdentificationMaterials.stream().collect(Collectors.toMap(EntrustmentIdentificationMaterial::getId, Function.identity()));
// List<EntrustMaterialCheckoutResultVO> entrustMaterialCheckoutResultVOS = records.stream().map(record -> {
// EntrustMaterialCheckoutResultVO entrustMaterialCheckoutResultVO = EntrustMaterialCheckoutResultConvert.entityToVO(record);
// entrustMaterialCheckoutResultVO.setName(materialMap.get(record.getId()).getName());
// return entrustMaterialCheckoutResultVO;
// }).collect(Collectors.toList());
// voPage.setRecords(entrustMaterialCheckoutResultVOS);
// }
return baseMapper.getEntrustMaterialCheckoutResultVOPage(
new Page<>(query.getCurrent(), query.getSize()),
Wrappers.<EntrustMaterialCheckoutResultVO>query()
@@ -333,8 +316,8 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
headList.add("序号");
headList.add("送检日期");
headList.add("送检单位");
headList.add("检材采集地");
headList.add("检材采集地");
headList.add("检材采集地（省）");
headList.add("检材采集地（市）");
headList.add("受理编号");
headList.add("检材编号");
headList.add("检材类型");
@@ -379,8 +362,10 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
excelDTO.setAcceptNo(entrust.getAcceptNo());
excelDTO.setOrderNo(material.getOrderNo());
excelDTO.setTypeName(typeName);
excelDTO.setColor(material.getColor());
excelDTO.setFormName(material.getFormName());
String formName = material.getFormName();
// 从检材性状描述中提取，因为贵阳没有填颜色， 匹配有色字的信息，例如“白色粉末”中的“白色”，否则取检材形态描述字段的值。
excelDTO.setColor(StrUtil.isBlank(material.getColor()) ? formName.substring(0, formName.indexOf("色") + 1) : material.getColor());
excelDTO.setFormName(formName);
EntrustMaterialCheckoutResult entrustMaterialCheckoutResult = checkoutResultMap.get(material.getId());
excelDTO.setQualitativeResult(
DrugLiteConvert.getDrugLites(entrustMaterialCheckoutResult.getQualitativeResult())
@@ -578,18 +563,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
} else {
wrapper.ge(Entrustment::getAcceptTime, this.getStartTime(null));
}
List<String> allResults = new ArrayList<>();
for (String oldResult : oldResults) {
if (StringUtils.isNotBlank(oldResult)) {
if ("委托".equals(oldResult)) {
allResults.add("首次鉴定");
allResults.add("补充鉴定");
allResults.add("重新鉴定");
} else {
allResults.add(oldResult);
}
}
}
List<String> allResults = getOriginalIdentificationList(oldResults);
if (!allResults.isEmpty()) {
wrapper.in(Entrustment::getOldIdentificationResult, allResults);
@@ -682,6 +656,27 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
return entrustmentIdentificationMaterialService.sortVoByAcceptNo(voList);
}
/**
* 根据原始鉴定结果获取所有可能的鉴定结果，包括委托、首次鉴定、补充鉴定和重新鉴定的情形。
* @param oldResults
* @return
*/
private List<String> getOriginalIdentificationList(List<String> oldResults) {
List<String> allResults = new ArrayList<>();
for (String oldResult : oldResults) {
if (StringUtils.isNotBlank(oldResult)) {
if ("委托".equals(oldResult)) {
allResults.add("首次鉴定");
allResults.add("补充鉴定");
allResults.add("重新鉴定");
} else {
allResults.add(oldResult);
}
}
}
return allResults;
}
public Map<String, List<EntrustmentIdentificationMaterialVO>> getResultDataMap(
ResultExcelDTO excelDTO) {
@@ -701,19 +696,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
qw.ge(Entrustment::getAcceptTime, this.getStartTime(null));
}
List<String> allResults = new ArrayList<>();
for (String oldResult : oldResults) {
if (StringUtils.isNotBlank(oldResult)) {
if ("委托".equals(oldResult)) {
allResults.add("首次鉴定");
allResults.add("补充鉴定");
allResults.add("重新鉴定");
} else {
allResults.add(oldResult);
}
}
}
List<String> allResults = getOriginalIdentificationList(oldResults);
if (!allResults.isEmpty()) {
qw.in(Entrustment::getOldIdentificationResult, allResults);
}
@@ -854,28 +837,41 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
}
}
/**
* 导出Excel
* @param response
* @param excelDTO
* @return
* @throws IOException
*/
@Override
public R getExcelByResult(HttpServletResponse response, ResultExcelDTO excelDTO) throws IOException {
// 获取查询数据
List<EntrustmentIdentificationMaterialVO> resultData = this.getResultData(excelDTO);
Map<String, List<EntrustmentIdentificationMaterialVO>> resultDataMap = this.getResultDataMap(excelDTO);
LocalDateTime startTime = excelDTO.getStartTime();
LocalDateTime endTime = excelDTO.getEndTime();
Integer entrustType = excelDTO.getEntrustType();
List<String> oldResults = excelDTO.getOldResult();
if (excelDTO.getExportForBigDataPlatform() != null && excelDTO.getExportForBigDataPlatform()) {
// 导出可上传至禁毒大数据平台文件
exportForBigDataPlatform(excelDTO, response);
} else {
// 获取查询数据
List<EntrustmentIdentificationMaterialVO> resultData = this.getResultData(excelDTO);
Map<String, List<EntrustmentIdentificationMaterialVO>> resultDataMap = this.getResultDataMap(excelDTO);
if (resultData.isEmpty() || resultDataMap.isEmpty()) {
return R.failed("没有符合条件的数据!");
LocalDateTime startTime = excelDTO.getStartTime();
LocalDateTime endTime = excelDTO.getEndTime();
Integer entrustType = excelDTO.getEntrustType();
List<String> oldResults = excelDTO.getOldResult();
if (resultData.isEmpty() || resultDataMap.isEmpty()) {
return R.failed("没有符合条件的数据!");
}
Workbook workbook = new XSSFWorkbook();
createDataSheet(workbook, entrustType, resultData);
createStatisticsSheet(workbook, resultDataMap, oldResults, entrustType, startTime, endTime);
createDrugSheets(workbook, resultDataMap, entrustType);
workbook.write(response.getOutputStream());
}
Workbook workbook = new XSSFWorkbook();
createDataSheet(workbook, entrustType, resultData);
createStatisticsSheet(workbook, resultDataMap, oldResults, entrustType, startTime, endTime);
createDrugSheets(workbook, resultDataMap, entrustType);
workbook.write(response.getOutputStream());
return R.ok("导出成功!");
}

1
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
View File

@@ -59,7 +59,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;

5
src/main/java/digital/laboratory/platform/entrustment/utils/ExcelUtils.java
View File

@@ -5,7 +5,10 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.web.multipart.MultipartFile;
import java.io.InputStream;
import java.util.*;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @author ChenJiangBao

1
src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java
View File

@@ -1,6 +1,5 @@
package digital.laboratory.platform.entrustment.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
src/main/java/digital/laboratory/platform/entrustment/vo/EntrustmentVO.java
View File

@@ -1,6 +1,5 @@
package digital.laboratory.platform.entrustment.vo;
import digital.laboratory.platform.common.aop.annotation.DlpFeign;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.entity.Suspect;