Explorar o código

word/excel导出PDF与PDF合并开发

anderx hai 5 meses
pai
achega
0d9b53997d

+ 6 - 7
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -15,7 +15,6 @@ import com.goafanti.common.service.PovertyService;
 import com.goafanti.common.utils.*;
 import com.goafanti.common.utils.excel.FileUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
-import com.goafanti.common.utils.pdf.PDFUtils;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.websocket.SystemWebSocketHandler;
@@ -1036,13 +1035,13 @@ public class PublicController extends CertifyApiController {
 
 		// 转换Word为PDF文件
 //		PDFUtils.convertWordToPDF("E:/4.docx", "E:/4-PDF.pdf");
-		PDFUtils.convertXlsxToPDF("E:/tmp/0811.xlsx", "E:/tmp/0811-PDF.pdf");
+//		PDFUtils.convertXlsxToPDF("E:/tmp/0811.xlsx", "E:/tmp/0811-PDF.pdf");
 
-//		List<String> list = Arrays.asList(
-//				"E:/tmp/3-PDF.pdf",
-//				"E:/tmp/4-PDF.pdf"
-//		);
-//		DocumentToPDFMerger.mergePdfFiles(list,  "E:/tmp/"+System.currentTimeMillis()+".pdf");
+		List<String> list = Arrays.asList(
+				"E:/tmp/4-PDF.pdf",
+				"E:/tmp/0811-PDF.pdf"
+		);
+		DocumentToPDFMerger.mergePdfFiles(list,  "E:/tmp/"+System.currentTimeMillis()+".pdf");
 		return new Result<>();
 	}
 }