From 68b49efb4da346edb42a5d8ebb39af47207402bd Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 12 十月 2026 11:14:13 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/MergeFilesToPDFUtils.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MergeFilesToPDFUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MergeFilesToPDFUtils.java
index f79b0e2..ba13ac9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MergeFilesToPDFUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MergeFilesToPDFUtils.java
@@ -1,13 +1,14 @@
package com.ruoyi.common.utils;
+import com.itextpdf.text.DocumentException;
import com.itextpdf.text.Image;
-import com.itextpdf.text.pdf.PdfWriter;
-import com.ruoyi.common.config.RuoYiConfig;
+import com.itextpdf.text.pdf.*;
import com.ruoyi.common.utils.file.FileUtils;
import com.spire.doc.Document;
import com.spire.doc.FileFormat;
import com.spire.pdf.PdfDocument;
import com.spire.pdf.PdfDocumentBase;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
@@ -18,8 +19,10 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.List;
@Configuration
+@Slf4j
public class MergeFilesToPDFUtils {
@Value("${ruoyi.archived}")
@@ -73,35 +76,45 @@
* @param outputPath
*/
public Boolean wordtoPdf(String inputPath, String outputPath) {
+ // Spire.Doc 鐨� Document 鎸佹湁鏂囦欢鍙ユ焺锛屽繀椤绘樉寮忓叧闂紝鍚﹀垯鍙ユ焺瑕佺瓑 finalize 鎵嶉噴鏀撅紝涓斾細鍗犵敤婧愭枃浠�
Document doc = new Document();
- //鍔犺浇Word
- doc.loadFromFile(inputPath);
- //淇濆瓨涓篜DF鏍煎紡
- doc.saveToFile(outputPath, FileFormat.PDF);
+ try {
+ //鍔犺浇Word
+ doc.loadFromFile(inputPath);
+ //淇濆瓨涓篜DF鏍煎紡
+ doc.saveToFile(outputPath, FileFormat.PDF);
+ } finally {
+ doc.close();
+ }
return true;
}
- /**
+ /**
* pdf鍚堝苟
*/
- public Boolean mergePDF(String[] pdfFiles, String fileName, HttpServletResponse response) {
+ public void mergePdfFiles(List<String> pdfFiles, String fileName) throws IOException, DocumentException {
+ com.itextpdf.text.Document document = new com.itextpdf.text.Document();
+ log.info("fileName鐨勫叏璺緞锛歿}", archived + "/" + fileName);
+ PdfCopy copy = new PdfCopy(document, new FileOutputStream(archived + "/" + fileName));
+ // 鍚堝苟杩囩▼涓换浣曚竴姝ユ姏寮傚父閮藉繀椤诲叧闂� document锛歞ocument.close() 浼氱骇鑱斿叧闂� PdfWriter 鍙婂叾杈撳嚭娴侊紝
+ // 鍚﹀垯杈撳嚭娴佸彞鏌勪細琚暱鏃堕棿鍗犵敤锛堜緷璧� finalize 鎵嶈兘閲婃斁锛夛紝涓斿紓甯告椂鏂囦欢鍐呭涓嶅畬鏁�
try {
-
-
- PdfDocumentBase pdf = PdfDocument.mergeFiles(pdfFiles);
- //Save the result to a PDF file
-
- pdf.save(archived + fileName, com.spire.pdf.FileFormat.PDF);
- String filePath = archived + fileName;
-
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
- FileUtils.setAttachmentResponseHeader(response, fileName);
- FileUtils.writeBytes(filePath, response.getOutputStream());
- } catch (Exception e) {
- e.printStackTrace();
- return false;
+ document.open();
+ for (String pdfFile : pdfFiles) {
+ PdfReader reader = new PdfReader(pdfFile);
+ try {
+ int totalPages = reader.getNumberOfPages();
+ for (int page = 1; page <= totalPages; page++) {
+ PdfImportedPage importedPage = copy.getImportedPage(reader, page);
+ copy.addPage(importedPage);
+ }
+ } finally {
+ reader.close();
+ }
+ }
+ } finally {
+ document.close();
}
- return true;
}
}
--
Gitblit v1.9.3