From 6747f77086734c5beaf05d7783f990c6e345c587 Mon Sep 17 00:00:00 2001 From: jueyue Date: Fri, 1 May 2015 22:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BA=86=E5=8C=85=E5=BC=95?= =?UTF-8?q?=E7=94=A8,=E5=AF=BC=E5=87=BA=20=E9=9B=86=E5=90=88name=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=B8=BA=E7=A9=BA=E4=BA=86,=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=88=9B=E5=BB=BA2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- easypoi-annotation/.classpath | 10 ------- easypoi-base/pom.xml | 18 ++++++++++--- .../poi/cache/manager/POICacheManager.java | 2 +- .../poi/excel/export/ExcelExportServer.java | 25 +++++++++++------- .../template/ExcelExportOfTemplateUtil.java | 6 ++--- easypoi-test/.classpath | 1 - .../poi/test/entity/CourseEntity.java | 2 +- .../poi/test/entity/StudentEntity.java | 18 ++++++------- .../poi/test/excel/doc/foreach.xlsx | Bin 9770 -> 9801 bytes .../excel/template/TemplateForEachTest.java | 11 +++++++- .../test/excel/test/ExcelExportForMap.java | 6 ++--- .../test/excel/test/ExcelExportUtilTest.java | 18 ++++++------- .../poi/test/read/ExcelImportUtilTest.java | 4 +-- .../test/word/WordExportUtilAnnExcelTest.java | 4 +-- .../word/WordExportUtilBaseExcelTest.java | 6 ++--- .../poi/test/word/WordExportUtilTest.java | 4 +-- easypoi-web/.classpath | 5 ---- pom.xml | 13 +++++---- 19 files changed, 84 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index ed72131..ec0901d 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ EasyPoi的几个入口工具类 2.easypoi-annotation 基础注解包,作用与实体对象上,拆分后方便maven多工程的依赖管理 3.easypoi-base 导入导出的工具包,可以完成Excel导出,导入,Word的导出,Excel的导出功能 4.easypoi-web 耦合了spring-mvc 基于AbstractView,极大的简化spring-mvc下的导出功能 - + 5.sax 导入使用xercesImpl这个包(这个包可能造成奇怪的问题哈),word导出使用poi-scratchpad,都作为可选包了 -------------------------- maven -------------------------- diff --git a/easypoi-annotation/.classpath b/easypoi-annotation/.classpath index 4d455a3..c9464c0 100644 --- a/easypoi-annotation/.classpath +++ b/easypoi-annotation/.classpath @@ -6,22 +6,12 @@ - - - - - - - - - - diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml index a59d6f8..bc59aa7 100644 --- a/easypoi-base/pom.xml +++ b/easypoi-base/pom.xml @@ -20,14 +20,24 @@ org.apache.poi poi-ooxml-schemas + + + xerces + xercesImpl + + - - org.apache.poi - poi-scratchpad - + xerces xercesImpl + true + + + + org.apache.poi + poi-scratchpad + true diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java index 9f00097..a970751 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java @@ -43,7 +43,7 @@ public final class POICacheManager { private static LoadingCache loadingCache; static { - loadingCache = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.DAYS).maximumSize(50) + loadingCache = CacheBuilder.newBuilder().expireAfterWrite(7, TimeUnit.DAYS).maximumSize(50) .build(new CacheLoader() { @Override public byte[] load(String url) throws Exception { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index 986b33e..f86f737 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Drawing; import org.apache.poi.ss.usermodel.Row; @@ -49,7 +50,7 @@ import org.slf4j.LoggerFactory; * @date 2014年6月17日 下午5:30:54 */ public class ExcelExportServer extends ExcelExportBase { - + private final static Logger LOGGER = LoggerFactory.getLogger(ExcelExportServer.class); // 最大行数,超过自动多Sheet @@ -174,7 +175,7 @@ public class ExcelExportServer extends ExcelExportBase { } } catch (Exception e) { - LOGGER.error(e.getMessage(),e); + LOGGER.error(e.getMessage(), e); LOGGER.error(e.getMessage(), e); throw new ExcelExportException(ExcelExportEnum.EXPORT_ERROR, e.getCause()); } @@ -272,15 +273,20 @@ public class ExcelExportServer extends ExcelExportBase { CellStyle titleStyle = getExcelExportStyler().getTitleStyle(title.getColor()); for (int i = 0, exportFieldTitleSize = excelParams.size(); i < exportFieldTitleSize; i++) { ExcelExportEntity entity = excelParams.get(i); - createStringCell(row, cellIndex, entity.getName(), titleStyle, entity); + if (StringUtils.isNoneBlank(entity.getName())) { + createStringCell(row, cellIndex, entity.getName(), titleStyle, entity); + } if (entity.getList() != null) { List sTitel = entity.getList(); - sheet.addMergedRegion(new CellRangeAddress(index, index, cellIndex, cellIndex - + sTitel.size() - - 1)); + if (StringUtils.isNoneBlank(entity.getName())) { + sheet.addMergedRegion(new CellRangeAddress(index, index, cellIndex, cellIndex + + sTitel + .size() + - 1)); + } for (int j = 0, size = sTitel.size(); j < size; j++) { - createStringCell(listRow, cellIndex, sTitel.get(j).getName(), titleStyle, - entity); + createStringCell(rows == 2 ? listRow : row, cellIndex, sTitel.get(j).getName(), + titleStyle, entity); cellIndex++; } } else if (rows == 2) { @@ -301,7 +307,8 @@ public class ExcelExportServer extends ExcelExportBase { */ private int getRowNums(List excelParams) { for (int i = 0; i < excelParams.size(); i++) { - if (excelParams.get(i).getList() != null) { + if (excelParams.get(i).getList() != null + && StringUtils.isNoneBlank(excelParams.get(i).getName())) { return 2; } } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java index f684866..784eb6e 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -96,9 +96,6 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { if (etarget != null) { targetId = etarget.value(); } - // 创建表格样式 - setExcelExportStyler((IExcelExportStyler) teplateParams.getStyle() - .getConstructor(Workbook.class).newInstance(workbook)); // 获取实体对象的导出数据 List excelParams = new ArrayList(); getAllExcelField(null, targetId, fileds, excelParams, pojoClass, null); @@ -172,6 +169,9 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { try { this.teplateParams = params; wb = getCloneWorkBook(); + // 创建表格样式 + setExcelExportStyler((IExcelExportStyler) teplateParams.getStyle() + .getConstructor(Workbook.class).newInstance(wb)); // step 3. 解析模板 for (int i = 0, le = params.isScanAllsheet() ? wb.getNumberOfSheets() : params .getSheetNum().length; i < le; i++) { diff --git a/easypoi-test/.classpath b/easypoi-test/.classpath index 7fbaeee..13ed0c0 100644 --- a/easypoi-test/.classpath +++ b/easypoi-test/.classpath @@ -6,7 +6,6 @@ - diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/CourseEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/CourseEntity.java index af164a2..c18eee4 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/CourseEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/CourseEntity.java @@ -32,7 +32,7 @@ public class CourseEntity implements java.io.Serializable { //@ExcelEntity(id = "shuxue") private TeacherEntity shuxueteacher; - @ExcelCollection(name = "选课学生", orderNum = "4") + @ExcelCollection(name = "", orderNum = "4") private List students; /** diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/StudentEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/StudentEntity.java index 5b887e4..eb20866 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/StudentEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/StudentEntity.java @@ -16,27 +16,27 @@ public class StudentEntity implements java.io.Serializable { /** * id */ - private String id; + private String id; /** * 学生姓名 */ @Excel(name = "学生姓名", height = 20, width = 30) - private String name; + private String name; /** * 学生性别 */ - @Excel(name = "学生性别", replace = { "男_1", "女_2" }, suffix = "生", mergeVertical = true) - private int sex; + @Excel(name = "学生性别", replace = { "男_1", "女_2" }, suffix = "生") + private int sex; + + @Excel(name = "出生日期", databaseFormat = "yyyyMMddHHmmss", exportFormat = "yyyy-MM-dd") + private Date birthday; - @Excel(name = "出生日期", databaseFormat = "yyyyMMddHHmmss", exportFormat = "yyyy-MM-dd", mergeVertical = true) - private Date birthday; - @Excel(name = "进校日期", databaseFormat = "yyyyMMddHHmmss", exportFormat = "yyyy-MM-dd") - private java.sql.Time registrationDate; + private java.sql.Time registrationDate; /** * 课程主键 */ - private CourseEntity course; + private CourseEntity course; public CourseEntity getCourse() { return course; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/doc/foreach.xlsx b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/doc/foreach.xlsx index a1af1b2fac1648545793fc5f20dea07a94b6caa0..be6702f020e308cde6286759447cb5bf1867cc82 100644 GIT binary patch delta 2077 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 diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/template/TemplateForEachTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/template/TemplateForEachTest.java index 36f574f..41f3630 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/template/TemplateForEachTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/template/TemplateForEachTest.java @@ -45,12 +45,21 @@ public class TemplateForEachTest { for (int i = 0; i < 4; i++) { Map testMap = new HashMap(); - testMap.put("id", i); + testMap.put("id", "xman"); testMap.put("name", "小明" + i); testMap.put("sex", "man"); mapList.add(testMap); } map.put("maplist", mapList); + + mapList = new ArrayList>(); + for (int i = 0; i < 6; i++) { + Map testMap = new HashMap(); + + testMap.put("si", "xman"); + mapList.add(testMap); + } + map.put("sitest", mapList); Workbook workbook = ExcelExportUtil.exportExcel(params, map); File savefile = new File("d:/"); if (!savefile.exists()) { diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportForMap.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportForMap.java index 35a113e..d10f66d 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportForMap.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportForMap.java @@ -21,7 +21,7 @@ public class ExcelExportForMap { /** * Map 测试 */ - //@Test + @Test public void test() { try { List entity = new ArrayList(); @@ -29,7 +29,7 @@ public class ExcelExportForMap { excelentity.setNeedMerge(true); entity.add(excelentity); entity.add(new ExcelExportEntity("性别", "sex")); - excelentity = new ExcelExportEntity("学生", "students"); + excelentity = new ExcelExportEntity(null, "students"); List temp = new ArrayList(); temp.add(new ExcelExportEntity("姓名", "name")); temp.add(new ExcelExportEntity("性别", "sex")); @@ -65,7 +65,7 @@ public class ExcelExportForMap { /** * 合并同类项 */ - @Test + //@Test public void testMerge() { try { List entity = new ArrayList(); diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilTest.java index b8d70d1..d5be03b 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilTest.java @@ -45,20 +45,20 @@ public class ExcelExportUtilTest { FileOutputStream fos = new FileOutputStream("d:/tt.xlsx"); workbook.write(fos); fos.close(); - savefile = new File("d:/1"); - if (!savefile.exists()) { - savefile.setWritable(true, false); - savefile.mkdirs(); - } - fos = new FileOutputStream("d:/1/tt3.xlsx"); - workbook.write(fos); - fos.close(); +// savefile = new File("d:/1"); +// if (!savefile.exists()) { +// savefile.setWritable(true, false); +// savefile.mkdirs(); +// } +// fos = new FileOutputStream("d:/1/tt3.xlsx"); +// workbook.write(fos); +// fos.close(); } @Before public void testBefore() { - for (int i = 0; i < 2000000; i++) { + for (int i = 0; i < 20; i++) { courseEntity = new CourseEntity(); courseEntity.setId("1131"); courseEntity.setName("海贼王必修(" + (i + 1) + ")"); diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/read/ExcelImportUtilTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/read/ExcelImportUtilTest.java index 2d0d783..e08cc57 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/read/ExcelImportUtilTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/read/ExcelImportUtilTest.java @@ -17,7 +17,7 @@ import org.junit.Test; public class ExcelImportUtilTest { - @Test + //@Test public void test() { try { ImportParams params = new ImportParams(); @@ -37,7 +37,7 @@ public class ExcelImportUtilTest { } } - // @Test + @Test public void test2() { ImportParams params = new ImportParams(); params.setTitleRows(1); diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilAnnExcelTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilAnnExcelTest.java index fad71a7..ef04835 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilAnnExcelTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilAnnExcelTest.java @@ -55,7 +55,7 @@ public class WordExportUtilAnnExcelTest { map.put("pList", new ExcelListEntity(list, Person.class)); try { XWPFDocument doc = WordExportUtil.exportWord07( - "org/jeecgframework/poi/word/doc/SimpleExcel.docx", map); + "org/jeecgframework/poi/test/word/doc/SimpleExcel.docx", map); FileOutputStream fos = new FileOutputStream("d:/simpleExcel.docx"); doc.write(fos); fos.close(); @@ -105,7 +105,7 @@ public class WordExportUtilAnnExcelTest { map.put("cs", new ExcelListEntity(list, CourseEntity.class)); try { XWPFDocument doc = WordExportUtil.exportWord07( - "org/jeecgframework/poi/word/doc/Excel.docx", map); + "org/jeecgframework/poi/test/word/doc/Excel.docx", map); FileOutputStream fos = new FileOutputStream("d:/Excel.docx"); doc.write(fos); fos.close(); diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilBaseExcelTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilBaseExcelTest.java index 2f34a2d..12cc618 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilBaseExcelTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilBaseExcelTest.java @@ -30,12 +30,12 @@ public class WordExportUtilBaseExcelTest { WordImageEntity image = new WordImageEntity(); image.setHeight(200); image.setWidth(500); - image.setUrl("org/jeecgframework/poi/word/img/testCode.png"); + image.setUrl("org/jeecgframework/poi/test/word/img/testCode.png"); image.setType(WordImageEntity.URL); map.put("testCode", image); try { XWPFDocument doc = WordExportUtil.exportWord07( - "org/jeecgframework/poi/word/doc/Image.docx", map); + "org/jeecgframework/poi/test/word/doc/Image.docx", map); FileOutputStream fos = new FileOutputStream("d:/image.docx"); doc.write(fos); fos.close(); @@ -68,7 +68,7 @@ public class WordExportUtilBaseExcelTest { map.put("pList", list); try { XWPFDocument doc = WordExportUtil.exportWord07( - "org/jeecgframework/poi/word/doc/SimpleExcel.docx", map); + "org/jeecgframework/poi/test/word/doc/SimpleExcel.docx", map); FileOutputStream fos = new FileOutputStream("d:/simpleExcel.docx"); doc.write(fos); fos.close(); diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilTest.java index 20299f3..97354e8 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilTest.java @@ -32,7 +32,7 @@ public class WordExportUtilTest { map.put("testCode", image); try { XWPFDocument doc = WordExportUtil.exportWord07( - "org/jeecgframework/poi/word/doc/Image.docx", map); + "org/jeecgframework/poi/test/word/doc/Image.docx", map); FileOutputStream fos = new FileOutputStream("d:/image.docx"); doc.write(fos); fos.close(); @@ -54,7 +54,7 @@ public class WordExportUtilTest { map.put("date", "2015-01-03"); try { XWPFDocument doc = WordExportUtil.exportWord07( - "org/jeecgframework/poi/word/doc/Simple.docx", map); + "org/jeecgframework/poi/test/word/doc/Simple.docx", map); FileOutputStream fos = new FileOutputStream("d:/simple.docx"); doc.write(fos); fos.close(); diff --git a/easypoi-web/.classpath b/easypoi-web/.classpath index f32149e..c9464c0 100644 --- a/easypoi-web/.classpath +++ b/easypoi-web/.classpath @@ -6,11 +6,6 @@ - - - - - diff --git a/pom.xml b/pom.xml index faac0b5..cfe838e 100644 --- a/pom.xml +++ b/pom.xml @@ -46,11 +46,19 @@ poi-ooxml ${poi.version} + org.apache.poi poi-ooxml-schemas ${poi.version} + + + xerces + xercesImpl + ${xerces.version} + true + org.apache.poi poi-scratchpad @@ -101,11 +109,6 @@ spring-core ${spring.version} - - xerces - xercesImpl - ${xerces.version} - javax.servlet