Explorar el Código

生成题卡pdf文件bug修复

xiaof hace 3 años
padre
commit
848df4213c

+ 6 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -683,7 +683,7 @@ public class CreatePdfUtil {
                                           List<PdfDto> mergePdfDeleteList) throws Exception {
         StringJoiner stringJoiner = new StringJoiner("").add(SystemConstant.PDF_TEMP_FILES_DIR).add(File.separator);
         // oss上只认"/",windows生成的路径分隔符全部替换为"/"
-        File localA4PdfFile = null, localA3PdfFile = null;
+        File localA4PdfFile = null, localA3PdfFile = null, localA3PdfCardFile =null;
         BasicAttachment basicAttachment = null;
         if (Objects.nonNull(dirNameA4)) {
             dirNameA4 = dirNameA4.replaceAll("\\\\", "/");
@@ -699,7 +699,7 @@ public class CreatePdfUtil {
         }
         if (Objects.nonNull(dirNameCardA3)) {
             dirNameCardA3 = dirNameCardA3.replaceAll("\\\\", "/");
-            localA3PdfFile = new File(stringJoiner.toString() + File.separator + dirNameCardA3);
+            localA3PdfCardFile = new File(stringJoiner.toString() + File.separator + dirNameCardA3);
             basicAttachment = basicAttachmentService.saveAttachmentPdf(dirNameCardA3, userId);
             tbTask.setImportFileName(basicAttachment.getName());
             tbTask.setImportFilePath(basicAttachment.getPath());
@@ -718,6 +718,10 @@ public class CreatePdfUtil {
             fileStoreUtil.ossUpload(dirNameA3, localA3PdfFile, DigestUtils.md5Hex(new FileInputStream(localA3PdfFile)), fileStoreUtil.getUploadEnumByPath(dirNameA3).getFssType());
             localA3PdfFile.delete();
         }
+        if (Objects.nonNull(localA3PdfCardFile)) {
+            fileStoreUtil.ossUpload(dirNameCardA3, localA3PdfCardFile, DigestUtils.md5Hex(new FileInputStream(localA3PdfCardFile)), fileStoreUtil.getUploadEnumByPath(dirNameCardA3).getFssType());
+            localA3PdfCardFile.delete();
+        }
         if (Objects.nonNull(localA4PdfFile)) {
             localA4PdfFile.delete();
         }