yxt_group
/
yxt
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复问题

master^2
dimengzhe 3 years ago
parent
a2faad097c
commit
d03748ea89
3 changed files with 100 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      yxt-common/yxt-common-base/pom.xml
  2. 27
      yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordConvertUtils.java
  3. 100
      yxt-parent/pom.xml

31
yxt-common/yxt-common-base/pom.xml
View File

@ -120,12 +120,6 @@
<artifactId>javase</artifactId> <artifactId>javase</artifactId>
<version>3.3.2</version> <version>3.3.2</version>
</dependency> </dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.4.3</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
@ -165,17 +159,11 @@
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
<version>${hutool.version}</version> <version>${hutool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>
<version>2.3.29</version> <version>2.3.29</version>
</dependency> </dependency>
<dependency>
<groupId>com.jacob</groupId>
<artifactId>jacob</artifactId>
<version>1.18</version>
</dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
@ -196,6 +184,25 @@
<artifactId>activation</artifactId> <artifactId>activation</artifactId>
<version>1.1.1</version> <version>1.1.1</version>
</dependency> </dependency>
<dependency>
<groupId>com.jacob</groupId>
<artifactId>jacob</artifactId>
<version>1.18</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.11</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
</dependency>
</dependencies> </dependencies>
<distributionManagement> <distributionManagement>

27
yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordConvertUtils.java
View File

@ -10,8 +10,11 @@ import com.jacob.com.Dispatch;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import freemarker.template.Template; import freemarker.template.Template;
import freemarker.template.Version; import freemarker.template.Version;
import org.apache.pdfbox.io.MemoryUsageSetting;
import org.apache.pdfbox.multipdf.PDFMergerUtility;
import java.io.*; import java.io.*;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -205,4 +208,28 @@ public class WordConvertUtils {
return false; return false;
} }
} }
/**
* pdf合并
*
* @param files 源文件的相对路径 例：["D:\anrui\upload\template\pdf\111.pdf","D:\anrui\upload\template\222.pdf"]
* @param targetPath 输出的pdf的路径 D:\anrui\upload\template\pdf\333.pdf
* @return
* @throws Exception
*/
public static File mulFile2One(List<File> files, String targetPath) throws Exception {
PDFMergerUtility mergePdf = new PDFMergerUtility();
for (File f : files) {
if (f.exists() && f.isFile()) {
// 循环添加要合并的pdf
mergePdf.addSource(f);
}
}
// 设置合并生成pdf文件名称
mergePdf.setDestinationFileName(targetPath);
// 合并pdf
mergePdf.mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly());
//ToDo:根据需求实现是否要删除源文件
return new File(targetPath);
}
} }

100
yxt-parent/pom.xml
View File

@ -77,6 +77,8 @@
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<flowable.version>6.5.0</flowable.version> <flowable.version>6.5.0</flowable.version>
<pdfbox.version>2.0.25</pdfbox.version>
</properties> </properties>
<!-- 依赖声明 --> <!-- 依赖声明 -->
@ -401,56 +403,62 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>${pdfbox.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
</dependencies> </dependencies>
<!-- <repositories>--> <!-- <repositories>-->
<!-- <repository>--> <!-- <repository>-->
<!-- <id>aliyun-central</id>--> <!-- <id>aliyun-central</id>-->
<!-- <url>https://maven.aliyun.com/repository/central</url>--> <!-- <url>https://maven.aliyun.com/repository/central</url>-->
<!-- </repository>--> <!-- </repository>-->
<!-- <repository>--> <!-- <repository>-->
<!-- <id>aliyun-public</id>--> <!-- <id>aliyun-public</id>-->
<!-- <url>https://maven.aliyun.com/repository/public</url>--> <!-- <url>https://maven.aliyun.com/repository/public</url>-->
<!-- </repository>--> <!-- </repository>-->
<!-- <repository>--> <!-- <repository>-->
<!-- <id>aliyun-google</id>--> <!-- <id>aliyun-google</id>-->
<!-- <url>https://maven.aliyun.com/repository/google</url>--> <!-- <url>https://maven.aliyun.com/repository/google</url>-->
<!-- </repository>--> <!-- </repository>-->
<!-- <repository>--> <!-- <repository>-->
<!-- <id>aliyun-spring</id>--> <!-- <id>aliyun-spring</id>-->
<!-- <url>https://maven.aliyun.com/repository/spring</url>--> <!-- <url>https://maven.aliyun.com/repository/spring</url>-->
<!-- </repository>--> <!-- </repository>-->
<!-- </repositories>--> <!-- </repositories>-->
<!-- <pluginRepositories>--> <!-- <pluginRepositories>-->
<!-- <pluginRepository>--> <!-- <pluginRepository>-->
<!-- <id>aliyun-central</id>--> <!-- <id>aliyun-central</id>-->
<!-- <url>https://maven.aliyun.com/repository/central</url>--> <!-- <url>https://maven.aliyun.com/repository/central</url>-->
<!-- </pluginRepository>--> <!-- </pluginRepository>-->
<!-- <pluginRepository>--> <!-- <pluginRepository>-->
<!-- <id>aliyun-public</id>--> <!-- <id>aliyun-public</id>-->
<!-- <url>https://maven.aliyun.com/repository/public</url>--> <!-- <url>https://maven.aliyun.com/repository/public</url>-->
<!-- </pluginRepository>--> <!-- </pluginRepository>-->
<!-- <pluginRepository>--> <!-- <pluginRepository>-->
<!-- <id>aliyun-google</id>--> <!-- <id>aliyun-google</id>-->
<!-- <url>https://maven.aliyun.com/repository/google</url>--> <!-- <url>https://maven.aliyun.com/repository/google</url>-->
<!-- </pluginRepository>--> <!-- </pluginRepository>-->
<!-- <pluginRepository>--> <!-- <pluginRepository>-->
<!-- <id>aliyun-spring</id>--> <!-- <id>aliyun-spring</id>-->
<!-- <url>https://maven.aliyun.com/repository/spring</url>--> <!-- <url>https://maven.aliyun.com/repository/spring</url>-->
<!-- </pluginRepository>--> <!-- </pluginRepository>-->
<!-- </pluginRepositories>--> <!-- </pluginRepositories>-->
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>nexus-releases</id> <id>nexus-releases</id>
<url>http://nexus3.yyundong.com/repository/yxt-mvn-releases/</url> <url>http://nexus3.yyundong.com/repository/yxt-mvn-releases/</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>nexus-snapshots</id> <id>nexus-snapshots</id>
<url>http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/</url> <url>http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
</project> </project>
Write Preview
Loading…
Cancel
Save