Browse Source

upgrade tl dependencies; make it compiling only

dengjia 1 month ago
parent
commit
f79dca9209

+ 7 - 2
easier-report-biz/pom.xml

@@ -122,15 +122,16 @@
         <dependency>
             <groupId>com.deepoove</groupId>
             <artifactId>poi-tl</artifactId>
-            <version>1.8.2</version>
+            <version>1.12.2</version>
         </dependency>
 
         <!-- Jsoup -->
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.13.1</version>
+            <version>1.20.1</version>
         </dependency>
+
         <!-- xdocreport(排除冲突) -->
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
@@ -158,6 +159,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

+ 3 - 3
easier-report-biz/src/main/java/com/yaoyicloud/template/AbstractReportExporter.java

@@ -25,7 +25,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.config.ConfigureBuilder;
-import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import com.deepoove.poi.policy.RenderPolicy;
 import com.deepoove.poi.template.ElementTemplate;
 import com.deepoove.poi.util.TableTools;
@@ -68,7 +68,7 @@ public abstract class AbstractReportExporter {
         //word导出位置
         String reportTempWordFile = basicPath + "/" + label + ".docx";
         // 定义策略
-        ConfigureBuilder builder = Configure.newBuilder();
+        ConfigureBuilder builder = Configure.builder();
         this.bindConfigure(builder);
         // 渲染数据
         this.renderTemplate(reportTempWordFile, templatePath, builder, data);
@@ -177,7 +177,7 @@ public abstract class AbstractReportExporter {
     }
 
     protected RenderPolicy getScoreRenderPolicy() {
-        RenderPolicy policy = new HackLoopTableRenderPolicy() {
+        RenderPolicy policy = new LoopRowTableRenderPolicy() {
             @SuppressWarnings("checkstyle:NestedForDepth")
             @Override
             public void render(ElementTemplate eleTemplate, Object data, XWPFTemplate template) {

+ 2 - 2
easier-report-biz/src/main/java/com/yaoyicloud/template/AcademicAssociationReport.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.config.ConfigureBuilder;
-import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import com.deepoove.poi.policy.RenderPolicy;
 
 
@@ -49,7 +49,7 @@ public class AcademicAssociationReport extends AbstractReportExporter {
     @Override
     protected void bindConfigure(ConfigureBuilder builder) {
         RenderPolicy scoreRenderPolicy = this.getScoreRenderPolicy();
-        HackLoopTableRenderPolicy hackLoopTableRenderPolicy = new HackLoopTableRenderPolicy();
+        LoopRowTableRenderPolicy hackLoopTableRenderPolicy = new LoopRowTableRenderPolicy();
         builder.bind("checkItemScores", scoreRenderPolicy).bind("basicInfoChecks", hackLoopTableRenderPolicy)
             .bind("businessAbnormals", hackLoopTableRenderPolicy).bind("dishonestPersons", hackLoopTableRenderPolicy)
             .bind("penaltyRecords", hackLoopTableRenderPolicy).bind("taxPenalties", hackLoopTableRenderPolicy)

+ 2 - 2
easier-report-biz/src/main/java/com/yaoyicloud/template/FoundationReport.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.config.ConfigureBuilder;
-import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import com.deepoove.poi.policy.RenderPolicy;
 
 
@@ -42,7 +42,7 @@ public class FoundationReport extends AbstractReportExporter {
     @Override
     protected void bindConfigure(ConfigureBuilder builder) {
         RenderPolicy scoreRenderPolicy = this.getScoreRenderPolicy();
-        HackLoopTableRenderPolicy hackLoopTableRenderPolicy = new HackLoopTableRenderPolicy();
+        LoopRowTableRenderPolicy hackLoopTableRenderPolicy = new LoopRowTableRenderPolicy();
         builder.bind("checkItemScores", scoreRenderPolicy).bind("basicInfoChecks", hackLoopTableRenderPolicy)
             .bind("businessAbnormals", hackLoopTableRenderPolicy).bind("dishonestPersons", hackLoopTableRenderPolicy)
             .bind("penaltyRecords", hackLoopTableRenderPolicy).bind("taxPenalties", hackLoopTableRenderPolicy)

+ 2 - 2
easier-report-biz/src/main/java/com/yaoyicloud/template/PlatformCompanyReport.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.config.ConfigureBuilder;
-import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import com.deepoove.poi.policy.RenderPolicy;
 
 import lombok.RequiredArgsConstructor;
@@ -41,7 +41,7 @@ public class PlatformCompanyReport extends AbstractReportExporter {
     @Override
     protected void bindConfigure(ConfigureBuilder builder) {
         RenderPolicy scoreRenderPolicy = this.getScoreRenderPolicy();
-        HackLoopTableRenderPolicy hackLoopTableRenderPolicy = new HackLoopTableRenderPolicy();
+        LoopRowTableRenderPolicy hackLoopTableRenderPolicy = new LoopRowTableRenderPolicy();
         builder.bind("checkItemScores", scoreRenderPolicy).bind("basicInfoChecks", hackLoopTableRenderPolicy)
             .bind("businessAbnormals", hackLoopTableRenderPolicy).bind("dishonestPersons", hackLoopTableRenderPolicy)
             .bind("penaltyRecords", hackLoopTableRenderPolicy).bind("taxPenalties", hackLoopTableRenderPolicy)

+ 9 - 0
easier-report-biz/src/test/java/com/yaoyicloud/report/TestServiceProviderInfoRender.java

@@ -0,0 +1,9 @@
+package com.yaoyicloud.report;
+
+public class TestServiceProviderInfoRender {
+
+    @Test
+    public void testRenderDocx() {
+    }
+
+}