From 6620dc7b245127616cb580700eb026da03e96de5 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 30 十二月 2024 17:06:48 +0800
Subject: [PATCH] fix:PAQ报告增加当前年度时间

---
 src/main/java/com/ots/project/tool/PdfUtil.java |   38 ++++++++++++++------------------------
 1 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/ots/project/tool/PdfUtil.java b/src/main/java/com/ots/project/tool/PdfUtil.java
index e7d60a2..607bb46 100644
--- a/src/main/java/com/ots/project/tool/PdfUtil.java
+++ b/src/main/java/com/ots/project/tool/PdfUtil.java
@@ -5,6 +5,7 @@
 
 import java.io.*;
 import java.lang.reflect.Constructor;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -16,7 +17,7 @@
      * 璁剧疆鐢ㄦ埛瀛椾綋浣嶇疆
      */
     public static void setFont() {
-        String[] fonts = {"C:\\Users\\澶уご\\AppData\\Local\\Microsoft\\Windows\\Fonts\\", "C:\\Users\\datou\\AppData\\Local\\Microsoft\\Windows\\Fonts\\", "/usr/share/fonts"};
+        String[] fonts = {"C:\\Windows\\Fonts", "C:\\Users\\datou\\AppData\\Local\\Microsoft\\Windows\\Fonts\\", "/usr/share/fonts"};
         List<FontSourceBase> fontSources = new ArrayList(Arrays.asList(FontSettings.getDefaultInstance().getFontsSources()));
         for (int i = 0; i < fonts.length; i++) {
             FolderFontSource folderFontSource = new FolderFontSource(fonts[i], true);
@@ -40,38 +41,27 @@
             pres.save(out, SaveFormat.PDF);
             out.close();
             long now = System.currentTimeMillis();
-            log.info("doc杞琾df鑰楁椂锛歿}绉�", ((now - old) / 1000.0));
+            log.info("銆愯浆鎹€�慸oc杞琾df鑰楁椂锛歿}绉�", ((now - old) / 1000.0));
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
-     * 鎵цpython鑴氭湰 docx杞琾df
-     * @param filePath
+     * docker word杞琾df
+     * @param profile
+     * @param docx2pdfPath
+     * @param fileName
      */
-    public static void convertPythonPDF(String pythonScript,String filePath){
+    public static void dockerConvertPDF(String profile,String docx2pdfPath,String fileName){
         try {
-            File file = new File(filePath);
-            if(!file.exists()){
-                file.mkdirs();
-            }
-            //鎵嬪姩鏇挎崲杈撳嚭pdf鍚嶇О
-            String output = filePath.replaceAll(".docx", ".pdf");
-
-            String os = System.getProperty("os.name");
-            String[] args1;
-            if (os.contains("Windows")){
-                args1 = new String[] { "python", pythonScript, filePath, output };
-            } else {
-                args1 = new String[] { "python3", pythonScript, filePath, output };
-            }
-            // 鎵цpy鏂囦欢
-            Process proc = Runtime.getRuntime().exec(args1);
+            String command = MessageFormat.format(docx2pdfPath,profile,fileName);
+            // 鎵цdocker 鍛戒护
+            Process proc = Runtime.getRuntime().exec(command);
             BufferedReader in = new BufferedReader(new InputStreamReader(proc.getInputStream(), "GBK"));
             String line = null;
-            log.info("python鎵ц鍛戒护:{}", Arrays.toString(args1));
-            log.info("python鎵ц杩斿洖");
+            log.info("docker鎵ц鍛戒护:{}", command);
+            log.info("docker鎵ц杩斿洖");
             while ((line = in.readLine()) != null) {
                 log.info(line);
             }
@@ -116,7 +106,7 @@
 
     public static void main(String[] args) {
         //convertPDF("D:\\娴嬭瘎绯荤粺\\home\\鏋梍PAQ_GS_TH.docx");
-        convertPDF("C:\\Users\\澶уご\\Desktop\\鏋�3_CIAQ_IA_CN.docx");
+        convertPDF("C:\\Users\\mac\\Desktop\\API_Fan_IA_CN.docx");
     }
 
 }

--
Gitblit v1.9.1