From c34c6b45200fb009ed4cbd0ea4c45f52094ece25 Mon Sep 17 00:00:00 2001 From: jueyue Date: Wed, 12 Jun 2019 16:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=8B=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../afterturn/easypoi/csv/CsvExportUtil.java | 29 ------------------- .../easypoi/excel/ExcelImportUtil.java | 7 ++--- .../easypoi/word/WordExportUtil.java | 7 +++++ 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/csv/CsvExportUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/csv/CsvExportUtil.java index 9482dcd..b904b25 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/csv/CsvExportUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/csv/CsvExportUtil.java @@ -2,10 +2,7 @@ package cn.afterturn.easypoi.csv; import cn.afterturn.easypoi.csv.entity.CsvExportParams; import cn.afterturn.easypoi.csv.export.CsvExportService; -import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import cn.afterturn.easypoi.excel.export.ExcelBatchExportService; -import org.apache.poi.ss.usermodel.Workbook; import java.io.OutputStream; import java.util.Collection; @@ -18,32 +15,6 @@ import java.util.List; */ public final class CsvExportUtil { - /** - * @param entity 表格标题属性 - * @param pojoClass Excel对象Class - * @param dataSet Excel对象数据List - */ - public static Workbook exportBigExcel(ExportParams entity, Class pojoClass, - Collection dataSet) { - ExcelBatchExportService batchService = ExcelBatchExportService - .getExcelBatchExportService(entity, pojoClass); - return batchService.appendData(dataSet); - } - - public static Workbook exportBigExcel(ExportParams entity, List excelParams, - Collection dataSet) { - ExcelBatchExportService batchService = ExcelBatchExportService - .getExcelBatchExportService(entity, excelParams); - return batchService.appendData(dataSet); - } - - public static void closeExportBigExcel() { - ExcelBatchExportService batchService = ExcelBatchExportService.getCurrentExcelBatchExportService(); - if (batchService != null) { - batchService.closeExportBigExcel(); - } - } - /** * @param params 表格标题属性 * @param pojoClass Excel对象Class diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/ExcelImportUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/ExcelImportUtil.java index f82d19d..d2e4cf8 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/ExcelImportUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/ExcelImportUtil.java @@ -130,12 +130,11 @@ public class ExcelImportUtil { * @param inputstream * @param pojoClass * @param params - * @param hanlder + * @param handler */ - @SuppressWarnings("rawtypes") public static void importExcelBySax(InputStream inputstream, Class pojoClass, - ImportParams params, IReadHandler hanlder) { - new SaxReadExcel().readExcel(inputstream, pojoClass, params, hanlder); + ImportParams params, IReadHandler handler) { + new SaxReadExcel().readExcel(inputstream, pojoClass, params, handler); } } diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/word/WordExportUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/word/WordExportUtil.java index bea9893..33c1233 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/word/WordExportUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/word/WordExportUtil.java @@ -61,6 +61,13 @@ public class WordExportUtil { new ParseWord07().parseWord(document, map); } + /** + * 一个模板生成多页 + * @param url + * @param list + * @return + * @throws Exception + */ public static XWPFDocument exportWord07(String url, List> list) throws Exception { return new ParseWord07().parseWord(url, list); }