diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index adcbe20..d7ca374 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -65,12 +65,6 @@ return subfileUrls; } - public static void main(String[] args ){ - wordFullSeam("D:\\casic\\tmp\\1762311829649956866\\测试报告.pdf","D:\\casic\\tmp\\1762311829649956866\\海口实验室证书或报告发放_1699357889588.png", - "D:\\casic\\tmp\\1762311829649956866\\测试报告2.pdf"); - - } - /** * 骑缝章只存在一个章在进行打印 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index adcbe20..d7ca374 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -65,12 +65,6 @@ return subfileUrls; } - public static void main(String[] args ){ - wordFullSeam("D:\\casic\\tmp\\1762311829649956866\\测试报告.pdf","D:\\casic\\tmp\\1762311829649956866\\海口实验室证书或报告发放_1699357889588.png", - "D:\\casic\\tmp\\1762311829649956866\\测试报告2.pdf"); - - } - /** * 骑缝章只存在一个章在进行打印 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 6f7317a..d3af582 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -131,17 +131,17 @@ } catch (RuntimeException rex) { log.error("文件打印出现异常,打印参数信息为{},异常信息为{}", JSON.toJSON(filePrintRegister), rex); } finally { -// if (ObjectUtils.isNotEmpty(registerParameters.getCompressParameter()) && registerParameters.getCompressParameter().getZip()) { -// //转移文件 -// fileMove(localFileDir + registerParameters.getCompressParameter().getRootDirName(), printDocUrl); -// } else if (StringUtils.isNotEmpty(printDocUrl)) { -// //如果文件路径不为空,回传文件流 -// miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); -// } -// //删除无效的文件 -// File invalidFile = new File(tempLocalFileDir); -// // 删除运行空间下的文件 -// deleteFile(invalidFile); + if (ObjectUtils.isNotEmpty(registerParameters.getCompressParameter()) && registerParameters.getCompressParameter().getZip()) { + //转移文件 + fileMove(localFileDir + registerParameters.getCompressParameter().getRootDirName(), printDocUrl); + } else if (StringUtils.isNotEmpty(printDocUrl)) { + //如果文件路径不为空,回传文件流 + miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); + } + //删除无效的文件 + File invalidFile = new File(tempLocalFileDir); + // 删除运行空间下的文件 + deleteFile(invalidFile); log.info("证书打印完成......,证书名称为{}", miniName); } return miniName;