水印修复

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/WatermarkUtil.java

@@ -2,6 +2,7 @@ package org.dromara.common.core.utils.file;
 
 import cn.hutool.core.io.FileUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.watermark.WatermarkProcessor;
 import org.dromara.common.core.utils.file.watermark.config.WatermarkConfig;
 import org.dromara.common.core.utils.file.watermark.processor.ImageWatermarkProcessor;
@@ -34,6 +35,7 @@ public class WatermarkUtil {
         PROCESSOR_MAP.put("pdf", new PdfWatermarkProcessor());
     }
 
+
     /**
      * 为文件添加文字水印
      *
@@ -57,6 +59,23 @@ public class WatermarkUtil {
         return processor.process(sourceFile, targetFile, config);
     }
 
+    /**
+     * 获取文件footName,
+     *
+     * @param path          文件路径
+     * @param watermarkText 水印文字
+     * @return 文件字体
+     */
+    public static String getFontName(String path, String watermarkText) {
+        // 获取文件扩展名
+        String extension = getFileExtension(path).toLowerCase();
+        if (StringUtils.equals(extension, "pdf")) {
+            return watermarkText.codePoints().anyMatch(c -> Character.UnicodeScript.of(c) == Character.UnicodeScript.HAN) ? "SimHei" : "Arial";
+        } else {
+            return "宋体";
+        }
+    }
+
     /**
      * 获取文件扩展名
      */
@@ -66,20 +85,22 @@ public class WatermarkUtil {
     }
 
     public static void main(String[] args) {
+
+
+        // 示例：给图片添加水印
+        Path sourceImagePath = Paths.get("D:\\1.jpg");
+        Path targetImagePath = Paths.get("D:\\output.jpg");
+
         // 配置水印参数
         WatermarkConfig imageConfig = new WatermarkConfig.Builder()
-            .watermarkText("测试水印")
-            .fontName("宋体")
+            .watermarkText("测试水印PDF")
+            .fontName(getFontName(sourceImagePath.toFile().getPath(), "测试水印PDF"))
             .fontSize(30)
             .color(Color.RED)
             .alpha(0.5f)
             .angle(30)
             .build();
 
-        // 示例：给图片添加水印
-        Path sourceImagePath = Paths.get("D:\\1.jpg");
-        Path targetImagePath = Paths.get("D:\\output.jpg");
-
         // 验证源文件是否存在
         if (!Files.exists(sourceImagePath)) {
             System.err.println("源文件不存在: " + sourceImagePath);
@@ -97,19 +118,20 @@ public class WatermarkUtil {
 
         addTextWatermark(sourceImagePath.toFile(), targetImagePath.toFile(), imageConfig);
 
+        // 示例：给PDF添加水印
+        File pdfFile = new File("C:\\Users\\wenhe\\Downloads\\安盛保险-卓越个人基础版.pdf");
+        File pdfOutputFile = FileUtil.touch(FileUtils.addFolderBeforeFileName(pdfFile.getPath(), "watermark"));
         // 配置PDF水印参数
         WatermarkConfig pdfConfig = new WatermarkConfig.Builder()
-            .watermarkText("Confidential")
-            .fontName("Helvetica")
+            .watermarkText("测试水印PDF")
+            .fontName(getFontName(pdfFile.getPath(),"测试水印PDF"))
             .fontSize(30)
             .color(Color.RED)
             .alpha(0.3f)
             .angle(45)
             .build();
 
-        // 示例：给PDF添加水印
-        File pdfFile = new File("C:\\Users\\wenhe\\Downloads\\安盛保险-卓越个人基础版.pdf");
-        File pdfOutputFile = FileUtil.touch(FileUtils.addFolderBeforeFileName(pdfFile.getPath(), "watermark"));
+
         addTextWatermark(pdfFile, pdfOutputFile, pdfConfig);
     }
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FileApproveServiceImpl.java

@@ -131,7 +131,7 @@ public class FileApproveServiceImpl extends AbstractBaseService<FileApproveVo, F
                 watermarkFile = FileUtil.touch(FileUtils.addFolderBeforeFileName(originFile.getPath(), "watermark"));
                 WatermarkConfig watermarkConfig = new WatermarkConfig.Builder()
                     .watermarkText(fa.getPurpose())
-                    .fontName(fa.getPurpose().codePoints().anyMatch(c -> Character.UnicodeScript.of(c) == Character.UnicodeScript.HAN) ? "SimHei" : "Arial")
+                    .fontName(WatermarkUtil.getFontName(originFile.getPath(), fa.getPurpose()))
                     .color(Color.RED)
                     .alpha(0.3f)
                     .angle(45)