From c4148dbd5c2d3a1376073b780e96e2a7aac6c7e6 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期一, 06 三月 2023 23:19:04 +0800
Subject: [PATCH] Merge branch 'framework-v11-20220919' into framework-v12-20221221
---
src/main/java/com/ots/project/tool/ShellTool.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/ShellTool.java b/src/main/java/com/ots/project/tool/ShellTool.java
index 1e2b8b1..07dff39 100644
--- a/src/main/java/com/ots/project/tool/ShellTool.java
+++ b/src/main/java/com/ots/project/tool/ShellTool.java
@@ -1,10 +1,41 @@
package com.ots.project.tool;
+import com.ots.common.utils.spring.SpringUtils;
+import com.ots.common.utils.text.CharsetKit;
+import com.ots.project.tool.libreoffice.Office2PDFUtils;
import lombok.extern.slf4j.Slf4j;
+import org.jodconverter.core.DocumentConverter;
+import org.jodconverter.core.office.OfficeException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
import java.io.*;
+import java.util.concurrent.ScheduledExecutorService;
@Slf4j
+@Component
public class ShellTool {
-
+
+// @Autowired
+// private DocumentConverter documentConverter;
+
+ @Autowired
+ private Office2PDFUtils office2PDFUtils;
+
+ private static ShellTool shellTool;
+
+ @PostConstruct
+ public void init(){
+ shellTool = this;
+ //shellTool.documentConverter = documentConverter;
+ shellTool.office2PDFUtils = office2PDFUtils;
+ }
+
+ public static ShellTool builder(){
+ return shellTool;
+ }
+
+
public static String execLibreofficeCommand(String type, String sourcePath, String targetPath) {
String os = System.getProperty("os.name");
StringBuilder builder = new StringBuilder();
@@ -25,10 +56,18 @@
file.delete();
}
} catch (Exception e) {
+ e.printStackTrace();
}
+ log.info("鎵ц鍛戒护:{}",builder.toString());
return exec(builder.toString());
}
+ public static void execNewLibreofficeCommand(String type, String sourcePath, String targetPath) throws OfficeException {
+ //浣跨敤鏂囦欢鏂瑰紡杞崲鎴怭DF
+ //shellTool.documentConverter.convert(new File(sourcePath)).to(new File(targetPath)).execute();
+ shellTool.office2PDFUtils.office2Pdf(sourcePath,targetPath);
+ }
+
private static String exec(String command) {
String returnString = "";
Runtime runTime = Runtime.getRuntime();
--
Gitblit v1.9.1