diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index dd37104..44fa97d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.BaseApprovalSubmitRequest; @@ -52,7 +53,6 @@ private GenericEqptDataProvider genericEqptDataProvider; @Override - @Transactional public ReturnDTO addMeasureApproval(BizBusinessDeviceMeasureApproval request) { //一条检定数据对应一个证书,存在非未通过的提示新增失败 QueryWrapper wrapper = new QueryWrapper<>(); @@ -114,7 +114,7 @@ @Override @Transactional - public ReturnDTO deleteMeasureApproval(Long id){ + public ReturnDTO deleteMeasureApproval(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); if (ObjectUtils.isEmpty(deviceMeasureApproval)) { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_DATA_IS_NULL); @@ -124,7 +124,7 @@ BizBusinessCertificatePrintMapper certificatePrintMapper = SpringContextUtil.getBean(BizBusinessCertificatePrintMapper.class); certificatePrintMapper.deleteByCertificateId(id); IEqptEquipmentInfoService eqptEquipmentInfoService = SpringContextUtil.getBean(IEqptEquipmentInfoService.class); - if(ObjectUtils.isEmpty(deviceMeasureApproval.getSampleId())||ObjectUtils.isEmpty(id)){ + if (ObjectUtils.isEmpty(deviceMeasureApproval.getSampleId()) || ObjectUtils.isEmpty(id)) { throw new BusinessException(BusinessExceptionEnum.SAMPLE_ID_IS_NULL); } eqptEquipmentInfoService.removeCertificateInfo(deviceMeasureApproval.getSampleId(), deviceMeasureApproval.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index dd37104..44fa97d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.BaseApprovalSubmitRequest; @@ -52,7 +53,6 @@ private GenericEqptDataProvider genericEqptDataProvider; @Override - @Transactional public ReturnDTO addMeasureApproval(BizBusinessDeviceMeasureApproval request) { //一条检定数据对应一个证书,存在非未通过的提示新增失败 QueryWrapper wrapper = new QueryWrapper<>(); @@ -114,7 +114,7 @@ @Override @Transactional - public ReturnDTO deleteMeasureApproval(Long id){ + public ReturnDTO deleteMeasureApproval(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); if (ObjectUtils.isEmpty(deviceMeasureApproval)) { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_DATA_IS_NULL); @@ -124,7 +124,7 @@ BizBusinessCertificatePrintMapper certificatePrintMapper = SpringContextUtil.getBean(BizBusinessCertificatePrintMapper.class); certificatePrintMapper.deleteByCertificateId(id); IEqptEquipmentInfoService eqptEquipmentInfoService = SpringContextUtil.getBean(IEqptEquipmentInfoService.class); - if(ObjectUtils.isEmpty(deviceMeasureApproval.getSampleId())||ObjectUtils.isEmpty(id)){ + if (ObjectUtils.isEmpty(deviceMeasureApproval.getSampleId()) || ObjectUtils.isEmpty(id)) { throw new BusinessException(BusinessExceptionEnum.SAMPLE_ID_IS_NULL); } eqptEquipmentInfoService.removeCertificateInfo(deviceMeasureApproval.getSampleId(), deviceMeasureApproval.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java index 225647f..2dd4d0a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.casic.missiles.service.listeners.register.FilePrintRegisterUtils; import com.casic.missiles.utils.MinioUtil; +import com.casic.missiles.utils.SpringContextUtil; import com.spire.ms.System.Collections.ArrayList; import io.minio.GetObjectArgs; import io.minio.MinioClient; @@ -31,8 +32,6 @@ @Autowired private MinioClient minioClient; - @Autowired - private MinioUtil minioUtil; @Value("${minio.bucketName}") private String bucketName; @@ -42,7 +41,7 @@ * @param printDocUrl 文件流路径,pdf,word * @param response */ - protected String createResponseFileInput(String printDocUrl, HttpServletResponse response) { + public static String createResponseFileInput(String printDocUrl, HttpServletResponse response) { if (response == null) { // return null; return uploadCertificate(printDocUrl); @@ -109,7 +108,7 @@ IOUtils.copy(in, out); //封装返回值 byte[] bytes = out.toByteArray(); - byteToFile(bytes, tempLocalFileDir, fileName); + byteToFile(bytes, tempLocalFileDir, fileName); } } catch (Exception e) { e.printStackTrace(); @@ -148,7 +147,7 @@ /** * 通过生成的证书报告,将证书报告上传到远程mini的文件服务器 */ - protected String uploadCertificate(String certificatePrintUrl) { + protected static String uploadCertificate(String certificatePrintUrl) { //上传证书 File file = new File(certificatePrintUrl); //获取file对象的文件输入流 @@ -159,6 +158,7 @@ MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), MediaType.MULTIPART_FORM_DATA_VALUE, IOUtils.toByteArray(input)); MultipartFile[] multipartFiles = new MultipartFile[1]; multipartFiles[0] = multipartFile; + MinioUtil minioUtil = SpringContextUtil.getBean(MinioUtil.class); nameList = minioUtil.upload(multipartFiles); } catch (IOException ie) { log.error("Description Failed to upload the certificate to the server,the failed reason is {}...", ie);