生成pdf处理

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceImpl.java

@@ -182,23 +182,23 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             if (Objects.nonNull(type) && Objects.equals(type, SystemConstant.FTL_PREFIX)) {
                 filePath = (String) jsonObject.get(SystemConstant.HTML_PATH);
                 if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig()) && filePath.contains(dictionaryConfig.fssLocalFileDomain().getConfig())) {
-                    url = filePath;
-                } else {
                     url = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + filePath;
+                    htmlFile = new File(url);
+                } else {
+                    htmlFile = new File(dictionaryConfig.fssPublicDomain().getConfig(), filePath);
                 }
-                htmlFile = new File(url);
             } else if (Objects.nonNull(type) && Objects.equals(type, SystemConstant.HTML_PREFIX)) {
                 filePath = (String) jsonObject.get(SystemConstant.PATH);
-                if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig()) && filePath.contains(dictionaryConfig.fssLocalFileDomain().getConfig())) {
-                    url = filePath;
-                } else {
-                    url = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + filePath;
-                }
                 UploadFileEnum uploadType = Enum.valueOf(UploadFileEnum.class, (String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
                 if (oss) {
                     htmlFile = fileStoreUtil.ossDownload(filePath, url, uploadType.getFssType());
                 } else {
-                    htmlFile = new File(filePath);
+                    if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig()) && filePath.contains(dictionaryConfig.fssLocalFileDomain().getConfig())) {
+                        url = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + filePath;
+                        htmlFile = new File(url);
+                    } else {
+                        htmlFile = new File(dictionaryConfig.fssPublicDomain().getConfig(), filePath);
+                    }
                 }
             }
             StringJoiner pdfStringJoiner = SystemConstant.getDirName(UploadFileEnum.PDF, true);
@@ -1366,6 +1366,8 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             String destUrl = null;
             if (Objects.nonNull(dictionaryConfig.fssLocalPdfDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalPdfDomain().getConfig())) {
                 destUrl = dictionaryConfig.fssLocalPdfDomain().getConfig() + File.separator + pdfDirName;
+            } else {
+                destUrl = dictionaryConfig.fssPublicDomain().getConfig() + File.separator + pdfDirName;
             }
 
             createPrintPdfUtil.createPackagePdf(pdfPackageDto, destUrl);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/AsyncExportTaskTemplete.java

@@ -122,7 +122,7 @@ public abstract class AsyncExportTaskTemplete {
                 if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig())) {
                     fileStoreUtil.copyInputStreamToFile(inputStream, finalFile, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), LocalCatalogEnum.LOCAL_FILE);
                 } else {
-                    fileStoreUtil.ossUpload(stringJoiner.toString(), inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), fileStoreUtil.getUploadEnumByPath(stringJoiner.toString()).getFssType());
+                    fileStoreUtil.ossUpload(stringJoiner.toString(), inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), UploadFileEnum.FILE.getFssType());
                 }
             }
             JSONObject json = new JSONObject();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -143,7 +143,7 @@ public abstract class AsyncImportTaskTemplete {
                 if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig())) {
                     fileStoreUtil.copyInputStreamToFile(inputStream, new File(stringJoiner.toString()), DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), LocalCatalogEnum.LOCAL_FILE);
                 } else {
-                    fileStoreUtil.ossUpload(stringJoiner.toString(), inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), fileStoreUtil.getUploadEnumByPath(stringJoiner.toString()).getFssType());
+                    fileStoreUtil.ossUpload(stringJoiner.toString(), inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), UploadFileEnum.FILE.getFssType());
                 }
             }
             JSONObject json = new JSONObject();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/push/AsyncPushTaskTemplate.java

@@ -112,7 +112,7 @@ public abstract class AsyncPushTaskTemplate {
                 if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig())) {
                     fileStoreUtil.copyInputStreamToFile(inputStream, new File(stringJoiner.toString()), DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), LocalCatalogEnum.LOCAL_FILE);
                 } else {
-                    fileStoreUtil.ossUpload(path, inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), fileStoreUtil.getUploadEnumByPath(stringJoiner.toString()).getFssType());
+                    fileStoreUtil.ossUpload(path, inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), UploadFileEnum.FILE.getFssType());
                 }
             }
             json.put(SystemConstant.PATH, path);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -685,7 +685,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 dirName = (dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + dirName).replaceAll("\\\\", "/");
                 fileStoreUtil.copyInputStreamToFile(in, new File(stringJoiner.toString()), DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), LocalCatalogEnum.LOCAL_FILE);
             } else {
-                fileStoreUtil.ossUpload(dirName, in, DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
+                fileStoreUtil.ossUpload(dirName, in, DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), UploadFileEnum.FILE.getFssType());
             }
             jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
             jsonObject.put(SystemConstant.PATH, dirName);

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

@@ -1122,6 +1122,8 @@ public class CreatePdfUtil {
         StringJoiner stringJoiner = new StringJoiner("");
         if (Objects.nonNull(dictionaryConfig.fssLocalPdfDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalPdfDomain().getConfig())) {
             stringJoiner = stringJoiner.add(dictionaryConfig.fssLocalPdfDomain().getConfig()).add(File.separator);
+        } else {
+            stringJoiner = stringJoiner.add(dictionaryConfig.fssPublicDomain().getConfig()).add(File.separator);
         }
         // oss上只认"/"，windows生成的路径分隔符全部替换为"/"
         File localA4PdfFile = null, localPaperPdfFile = null, localA3PdfCardFile = null;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/FreemarkerUtil.java

@@ -99,9 +99,10 @@ public class FreemarkerUtil {
             Configuration configuration = new Configuration(Configuration.VERSION_2_3_29);
             File templates = null;
             if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig()) && ftlPath.contains(dictionaryConfig.fssLocalFileDomain().getConfig())) {
-                templates = ResourceUtils.getFile(ftlPath);
-            } else {
                 templates = ResourceUtils.getFile(dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + ftlPath);
+            } else {
+                File file = new File(dictionaryConfig.fssPublicDomain().getConfig(), ftlPath);
+                templates = ResourceUtils.getFile(file.getPath());
             }
             configuration.setDirectoryForTemplateLoading(templates);
             // step1 加载模版文件

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfUtil.java

@@ -64,7 +64,7 @@ public class PdfUtil {
                     } else {
                         stringJoiner = stringJoiner.add(dictionaryConfig.fssPublicDomain().getConfig()).add(File.separator);
                     }
-                    dirName = SystemConstant.getDirName(stringJoiner, UploadFileEnum.PDF, true);
+                    dirName = SystemConstant.getDirName(UploadFileEnum.PDF, true);
                     dirName.add(SystemConstant.getNanoId()).add(SystemConstant.PDF_PREFIX);
                     outputPath = stringJoiner.toString() + dirName.toString();
                 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicAttachmentServiceImpl.java

@@ -71,6 +71,8 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
             StringJoiner stringJoiner = new StringJoiner("");
             if (Objects.nonNull(dictionaryConfig.fssLocalPdfDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalPdfDomain().getConfig())) {
                 stringJoiner = stringJoiner.add(dictionaryConfig.fssLocalPdfDomain().getConfig()).add(File.separator);
+            } else {
+                stringJoiner = stringJoiner.add(dictionaryConfig.fssPublicDomain().getConfig()).add(File.separator);
             }
             File localPdfFile = new File(stringJoiner.toString() + File.separator + dirName);
             if (!localPdfFile.getParentFile().exists()) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -614,10 +614,10 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         } else {
             if (Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig()) && !filePath.contains(dictionaryConfig.fssLocalFileDomain().getConfig())) {
                 localPath = localPath.add(dictionaryConfig.fssLocalFileDomain().getConfig()).add(File.separator).add(filePath);
+                file = new File(localPath.toString());
             } else {
-                localPath = localPath.add(filePath);
+                file = new File(dictionaryConfig.fssPublicDomain().getConfig(), filePath);
             }
-            file = new File(localPath.toString());
         }
         return file;
     }