aQiu6 4 місяців тому
батько
коміт
76e7792bd0

+ 54 - 0
pom.xml

@@ -36,28 +36,58 @@
             <groupId>org.docx4j</groupId>
             <artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
             <version>11.4.9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.docx4j</groupId>
             <artifactId>docx4j-export-fo</artifactId>
             <version>11.4.9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- iText for PDF conversion -->
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
             <version>5.5.13.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.itextpdf.tool</groupId>
             <artifactId>xmlworker</artifactId>
             <version>5.5.13.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/jakarta.xml.bind/jakarta.xml.bind-api -->
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>4.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
         <dependency>
@@ -100,12 +130,24 @@
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
             <version>2.0.27</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
             <version>2.3.34</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -178,12 +220,24 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>2.18.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
             <version>2.18.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 1 - 1
src/main/java/org/example/mybatisplus/Controller/IndexController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import org.docx4j.openpackaging.io3.stores.ZipPartStore;
 import org.example.mybatisplus.model.auto.CmsEnterpriseRiskInfoCheckBO;
 import org.example.mybatisplus.model.auto.CmsEnterpriseRiskInfoDeclaration;
 import org.example.mybatisplus.model.auto.CmsEnterpriseRiskQxbInfoBO;
@@ -59,7 +60,6 @@ public class IndexController {
             // 生成Word文档
             WordPoiExporter.init(wordFilePath,wordExportpath,jsonObject);
             // 将Word文档转换为PDF
-
            // WordPoiExporter.saveAsPdf("G:\\Word\\房屋租赁合同书.docx",pdfFilePath);
         } catch (Exception e) {
             e.printStackTrace();

+ 2 - 0
src/main/java/org/example/mybatisplus/module/vo/DocumentVo.java

@@ -9,6 +9,8 @@ import java.util.List;
  */
 @Data
 public class DocumentVo {
+    private String docurl1;
+    private String docurl2;
     // 7.1 基金会法人登记证书
     private List<Attachment> foundationLegalPersonRegistrationCertificate;
     // 6.2 基金会法人登记证书-最新年...

+ 1 - 1
src/main/java/org/example/mybatisplus/tools/WordPoiExporter.java

@@ -31,7 +31,7 @@ public class WordPoiExporter {
             FileOutputStream out = new FileOutputStream(path);
 
             doc.write(out);
-            saveAsPdf(doc, pdfFilePath);
+            convert(path, pdfFilePath);
             out.close();
         } catch (Exception e) {
             e.printStackTrace();