Selaa lähdekoodia

删除部分本地临时文件

wangliang 4 vuotta sitten
vanhempi
commit
10af9ebeaf

+ 2 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicAttachmentServiceImpl.java

@@ -153,7 +153,7 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
                 localFileList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount()));
                 fileMd5 = DigestUtils.md5Hex(new FileInputStream(pdfFile));
                 ossUtil.ossUpload(pdfDirName, pdfFile, BinaryUtil.toBase64String(HexUtils.decodeHex(fileMd5)));
-//                localHtmlFile.delete();
+                localHtmlFile.delete();
                 jsonObject.put(SystemConstant.PDF_PATH, pdfDirName);
             } else {//上传至服务器
                 File finalFile = new File(stringJoiner.toString());
@@ -311,7 +311,7 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
             if (oss) {//上传至oss
                 pdfDto = PdfUtil.addPdfPage(pdfFile);
                 ossUtil.ossUpload(pdfDirNameStr, pdfFile, BinaryUtil.toBase64String(HexUtils.decodeHex(pdfFileMd5)));
-//                htmlFile.delete();
+                htmlFile.delete();
             }
             JSONObject attachmentPath = JSONObject.parseObject(examDetail.getAttachmentPath());
             attachmentPath = Objects.isNull(attachmentPath) ? new JSONObject() : attachmentPath;

+ 13 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -495,12 +495,21 @@ public class CreatePdfUtil {
         examDetail.setStatus(PrintMethodEnum.AUTO == basicExamRule.getPrintMethod() ? ExamDetailStatusEnum.WAITING : ExamDetailStatusEnum.READY);
         detailService.saveOrUpdate(examDetail);
         ossUtil.ossUpload(dirNameA3, localA3PdfFile, DigestUtils.md5Hex(new FileInputStream(localA3PdfFile)));
-//        localPdfFile.delete();
-//        for (PdfDto pdfDto : mergePdfList) {
-//            new File(pdfDto.getPath()).delete();
+        if (Objects.nonNull(localA3PdfFile)) {
+            localA3PdfFile.delete();
+        }
+        if (Objects.nonNull(localA4PdfFile)) {
+            localA4PdfFile.delete();
+        }
+//        for (PdfDto pdfDto : mergePdfA3List) {
+//            if (Objects.nonNull(pdfDto)) {
+//                new File(pdfDto.getPath()).delete();
+//            }
 //        }
 //        for (PdfDto pdfDto : mergePdfA4List) {
-//            new File(pdfDto.getPath()).delete();
+//            if (Objects.nonNull(pdfDto)) {
+//                new File(pdfDto.getPath()).delete();
+//            }
 //        }
         return basicAttachment;
     }