diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java index 40a1867..1f7dc2b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java @@ -48,7 +48,6 @@ private final IDownloadCenterService downloadCenterService; - @ApiOperation("下载文件分页") @PostMapping("/listPage") @ResponseBody diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java index 40a1867..1f7dc2b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/DownloadCenterController.java @@ -48,7 +48,6 @@ private final IDownloadCenterService downloadCenterService; - @ApiOperation("下载文件分页") @PostMapping("/listPage") @ResponseBody diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java index e6d50a3..18834dd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java @@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.*; +import java.util.List; import java.util.Objects; /** @@ -25,7 +26,7 @@ */ @Component @Slf4j -public class PrintFileRegister{ +public class PrintFileRegister { @Autowired private MinioClient minioClient; @@ -45,7 +46,7 @@ * 5、递归删除因为打印产生的文件信息 * 6、返还打印产生的证书文件 */ - public String registerPrintFile(Object printFileRegister,String prefixType) { + public String registerPrintFile(Object printFileRegister, String prefixType) { String tempLocalFileDir = localFileDir; Assert.isFalse(Objects.isNull(printFileRegister), () -> { throw new RuntimeException("the certificateReport is null,please check your params..."); @@ -69,9 +70,7 @@ //合并注册 String certificatePdfUrl = FilePrintRegisterUtils.filePrintGenerate(metaData); //上传到服务器 - uploadCertificate(certificatePdfUrl); - File certificatePdfFile = new File(certificatePdfUrl); - String certificatePdfName=certificatePdfFile.getName(); + String certificatePdfName=uploadCertificate(certificatePdfUrl); //删除无效的文件 File invalidFile = new File(tempLocalFileDir); log.debug("invalid print file start delete, the file directory is {}", tempLocalFileDir); @@ -130,17 +129,18 @@ /** * 通过生成的证书报告,将证书报告上传到远程mini的文件服务器 */ - public void uploadCertificate(String certificatePrintUrl) { + public String uploadCertificate(String certificatePrintUrl) { //上传证书 File file = new File(certificatePrintUrl); //获取file对象的文件输入流 FileInputStream input = null; + List nameList = null; try { input = new FileInputStream(file); MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input)); MultipartFile[] multipartFiles = new MultipartFile[1]; multipartFiles[0] = multipartFile; - minioUtil.upload(multipartFiles); + nameList = minioUtil.upload(multipartFiles); } catch (IOException ie) { log.error("Description Failed to upload the certificate to the server,the failed reason is {}...", ie); } finally { @@ -151,6 +151,7 @@ log.error("the upload Certificate input stream release is anomaly"); } } + return nameList.get(0); } }