From 48ef70add49ad214156719023b3a1f2691cd6763 Mon Sep 17 00:00:00 2001 From: jueyue Date: Thu, 26 Feb 2015 14:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E4=BA=86=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8A=9F=E8=83=BD,=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=88=B0?= =?UTF-8?q?Excel=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../poi/excel/ExcelImportUtil.java | 9 +- .../poi/excel/annotation/ExcelVerify.java | 9 +- .../entity/result/ExcelImportResult.java | 13 +- .../poi/excel/imports/ExcelImportServer.java | 52 ++++++-- .../imports/verifys/BaseVerifyHandler.java | 10 +- .../imports/verifys/VerifyHandlerServer.java | 33 +++-- .../excel/enums/ExcelImportEnum.java | 2 +- .../poi/word/parse/ParseWord07.java | 1 - easypoi-test/.classpath | 4 +- .../org/jeecgframework/poi/test/.gitignore | 1 + .../poi/{ => test}/UtilTest.java | 2 +- .../poi/{ => test}/entity/CourseEntity.java | 2 +- .../poi/test/entity/ExcelVerifyEntity.java | 124 ++++++++++++++++++ .../poi/{ => test}/entity/MsgClient.java | 2 +- .../poi/{ => test}/entity/MsgClientGroup.java | 2 +- .../poi/{ => test}/entity/StudentEntity.java | 2 +- .../poi/{ => test}/entity/TeacherEntity.java | 2 +- .../poi/{ => test}/entity/TestEntity.java | 2 +- .../entity/statistics/StatisticEntity.java | 2 +- .../entity/temp/BudgetAccountsEntity.java | 2 +- .../{ => test}/entity/temp/PayeeEntity.java | 2 +- .../temp/TemplateExcelExportEntity.java | 2 +- .../poi/{ => test}/excel/doc/exportTemp.xls | Bin .../excel/doc/专项支出用款申请书.xls | Bin .../template/TemplateExcelExportTest.java | 10 +- .../{ => test}/excel/test/CourseHanlder.java | 2 +- .../excel/test/ExcelExportForMap.java | 2 +- .../excel/test/ExcelExportMsgClient.java | 8 +- .../excel/test/ExcelExportStatisticTest.java | 4 +- .../excel/test/ExcelExportTemplateTest.java | 8 +- .../test/ExcelExportUtilDataHandlerTest.java | 8 +- .../excel/test/ExcelExportUtilIdTest.java | 8 +- .../excel/test/ExcelExportUtilTest.java | 8 +- .../read}/ExcelImportUtilTest.java | 9 +- .../word/WordExportUtilAnnExcelTest.java | 11 +- .../word/WordExportUtilBaseExcelTest.java | 5 +- .../{ => test}/word/WordExportUtilTest.java | 3 +- .../poi/{ => test}/word/doc/Excel.docx | Bin .../poi/{ => test}/word/doc/Image.docx | Bin .../poi/{ => test}/word/doc/Simple.docx | Bin .../poi/{ => test}/word/doc/SimpleExcel.docx | Bin .../poi/{ => test}/word/entity/Person.java | 2 +- .../poi/{ => test}/word/img/testCode.png | Bin 44 files changed, 267 insertions(+), 103 deletions(-) create mode 100644 easypoi-test/src/main/java/org/jeecgframework/poi/test/.gitignore rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/UtilTest.java (85%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/CourseEntity.java (94%) create mode 100644 easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/ExcelVerifyEntity.java rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/MsgClient.java (94%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/MsgClientGroup.java (92%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/StudentEntity.java (93%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/TeacherEntity.java (93%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/TestEntity.java (86%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/statistics/StatisticEntity.java (92%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/temp/BudgetAccountsEntity.java (86%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/temp/PayeeEntity.java (89%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/entity/temp/TemplateExcelExportEntity.java (94%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/doc/exportTemp.xls (100%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/doc/专项支出用款申请书.xls (100%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/template/TemplateExcelExportTest.java (88%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/CourseHanlder.java (88%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/ExcelExportForMap.java (95%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/ExcelExportMsgClient.java (86%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/ExcelExportStatisticTest.java (90%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/ExcelExportTemplateTest.java (91%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/ExcelExportUtilDataHandlerTest.java (88%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/ExcelExportUtilIdTest.java (88%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/excel/test/ExcelExportUtilTest.java (92%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{excel => test/read}/ExcelImportUtilTest.java (86%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/WordExportUtilAnnExcelTest.java (89%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/WordExportUtilBaseExcelTest.java (91%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/WordExportUtilTest.java (92%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/doc/Excel.docx (100%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/doc/Image.docx (100%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/doc/Simple.docx (100%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/doc/SimpleExcel.docx (100%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/entity/Person.java (88%) rename easypoi-test/src/main/java/org/jeecgframework/poi/{ => test}/word/img/testCode.png (100%) diff --git a/README.md b/README.md index bbe25f8..cef5738 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ =========================== EasyPoi Excel和 Word简易工具类 =========================== - easypoi功能如同名字easy,主打的功能就是易容,让一个没见接触过poi的人员 + easypoi功能如同名字easy,主打的功能就是容易,让一个没见接触过poi的人员 就可以方便的写出Excel导出,Excel模板导出,Excel导入,Word模板导出,通过简单的注解和模板 语言(熟悉的表达式语法),完成以前复杂的写法 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java index c72b73e..8c9a965 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java @@ -77,8 +77,9 @@ public class ExcelImportUtil { * @return * @throws Exception */ - public static ExcelImportResult importExcelVerify(InputStream inputstream, Class pojoClass, - ImportParams params) throws Exception { + public static ExcelImportResult importExcelVerify(InputStream inputstream, + Class pojoClass, ImportParams params) + throws Exception { return new ExcelImportServer().importExcelByIs(inputstream, pojoClass, params); } @@ -91,8 +92,8 @@ public class ExcelImportUtil { * @return * @throws Exception */ - public static ExcelImportResult importExcelVerify(File file, Class pojoClass, - ImportParams params) { + public static ExcelImportResult importExcelVerify(File file, Class pojoClass, + ImportParams params) { FileInputStream in = null; try { in = new FileInputStream(file); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelVerify.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelVerify.java index e1e7c04..c99ca54 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelVerify.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelVerify.java @@ -1,17 +1,24 @@ package org.jeecgframework.poi.excel.annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * Excel 导入校验 * * @author JueYue * @date 2014年6月23日 下午10:46:26 */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) public @interface ExcelVerify { /** * 接口校验 * @return */ - public boolean interHandler() default true; + public boolean interHandler() default false; /** * 是电子邮件 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.java index f4f425e..9cdd0c2 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.java @@ -10,13 +10,12 @@ import org.apache.poi.ss.usermodel.Workbook; * @author JueYue * @date 2014年6月29日 下午5:12:10 */ -@SuppressWarnings("rawtypes") -public class ExcelImportResult { +public class ExcelImportResult { /** * 结果集 */ - private List list; + private List list; /** * 是否存在校验失败 @@ -27,16 +26,18 @@ public class ExcelImportResult { * 数据源 */ private Workbook workbook; + public ExcelImportResult() { } - public ExcelImportResult(List list, boolean verfiyFail, Workbook workbook) { + + public ExcelImportResult(List list, boolean verfiyFail, Workbook workbook) { this.list = list; this.verfiyFail = verfiyFail; this.workbook = workbook; } - public List getList() { + public List getList() { return list; } @@ -48,7 +49,7 @@ public class ExcelImportResult { return verfiyFail; } - public void setList(List list) { + public void setList(List list) { this.list = list; } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java index 93ec2d2..0914ef3 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java @@ -21,6 +21,8 @@ import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.PictureData; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -35,6 +37,8 @@ import org.jeecgframework.poi.excel.entity.result.ExcelImportResult; import org.jeecgframework.poi.excel.entity.result.ExcelVerifyHanlderResult; import org.jeecgframework.poi.excel.imports.base.ImportBaseService; import org.jeecgframework.poi.excel.imports.verifys.VerifyHandlerServer; +import org.jeecgframework.poi.exception.excel.ExcelImportException; +import org.jeecgframework.poi.exception.excel.enums.ExcelImportEnum; import org.jeecgframework.poi.util.POIPublicUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,6 +59,10 @@ public class ExcelImportServer extends ImportBaseService { private VerifyHandlerServer verifyHandlerServer; private boolean verfiyFail = false; + /** + * 异常数据styler + */ + private CellStyle errorCellStyle; public ExcelImportServer() { this.cellValueServer = new CellValueServer(); @@ -190,22 +198,29 @@ public class ExcelImportServer extends ImportBaseService { } } else { object = POIPublicUtil.createObject(pojoClass, targetId); - for (int i = row.getFirstCellNum(), le = row.getLastCellNum(); i < le; i++) { - Cell cell = row.getCell(i); - String titleString = (String) titlemap.get(i); - if (excelParams.containsKey(titleString)) { - if (excelParams.get(titleString).getType() == 2) { - picId = row.getRowNum() + "_" + i; - saveImage(object, picId, excelParams, titleString, pictures, params); - } else { - saveFieldValue(params, object, cell, excelParams, titleString, row); + try { + for (int i = row.getFirstCellNum(), le = row.getLastCellNum(); i < le; i++) { + Cell cell = row.getCell(i); + String titleString = (String) titlemap.get(i); + if (excelParams.containsKey(titleString)) { + if (excelParams.get(titleString).getType() == 2) { + picId = row.getRowNum() + "_" + i; + saveImage(object, picId, excelParams, titleString, pictures, params); + } else { + saveFieldValue(params, object, cell, excelParams, titleString, row); + } } } + + for (ExcelCollectionParams param : excelCollection) { + addListContinue(object, param, row, titlemap, targetId, pictures, params); + } + collection.add(object); + } catch (ExcelImportException e) { + if (!e.getType().equals(ExcelImportEnum.VERIFY_ERROR)) { + throw new ExcelImportException(e.getType(), e); + } } - for (ExcelCollectionParams param : excelCollection) { - addListContinue(object, param, row, titlemap, targetId, pictures, params); - } - collection.add(object); } } return collection; @@ -237,6 +252,7 @@ public class ExcelImportServer extends ImportBaseService { } else if (POIXMLDocument.hasOOXMLHeader(inputstream)) { book = new XSSFWorkbook(OPCPackage.open(inputstream)); } + createErrorCellStyle(book); Map pictures; for (int i = 0; i < params.getSheetNum(); i++) { if (LOGGER.isDebugEnabled()) { @@ -271,7 +287,6 @@ public class ExcelImportServer extends ImportBaseService { * @param cell * @param excelParams * @param titleString - * @param excelParams2 * @param row * @throws Exception */ @@ -288,7 +303,9 @@ public class ExcelImportServer extends ImportBaseService { } else { Cell errorCell = row.createCell(row.getLastCellNum()); errorCell.setCellValue(verifyResult.getMsg()); + errorCell.setCellStyle(errorCellStyle); verfiyFail = true; + throw new ExcelImportException(ExcelImportEnum.VERIFY_ERROR); } } @@ -330,4 +347,11 @@ public class ExcelImportServer extends ImportBaseService { } } + private void createErrorCellStyle(Workbook workbook) { + errorCellStyle = workbook.createCellStyle(); + Font font = workbook.createFont(); + font.setColor(Font.COLOR_RED); + errorCellStyle.setFont(font); + } + } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/BaseVerifyHandler.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/BaseVerifyHandler.java index 540ba3c..bef28b7 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/BaseVerifyHandler.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/BaseVerifyHandler.java @@ -19,14 +19,12 @@ public class BaseVerifyHandler { private static String MIN_LENGHT = "小于规定长度"; private static String MAX_LENGHT = "超过规定长度"; - private static Pattern mobilePattern = Pattern - .compile("/^[+]{0,1}(\\d){1,3}[ ]?([-]?((\\d)|[ ]){1,12})+$/"); + private static Pattern mobilePattern = Pattern.compile("^[1][3,4,5,8,7][0-9]{9}$"); - private static Pattern telPattern = Pattern - .compile("/^[+]{0,1}(\\d){1,3}[ ]?([-]?((\\d)|[ ]){1,12})+$/"); + private static Pattern telPattern = Pattern.compile("^([0][1-9]{2,3}-)?[0-9]{5,10}$"); private static Pattern emailPattern = Pattern - .compile(" /^([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+\\.[a-zA-Z]{2,3}$/"); + .compile("^([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+\\.[a-zA-Z]{2,3}$"); /** * email校验 @@ -107,7 +105,7 @@ public class BaseVerifyHandler { * @return */ public static ExcelVerifyHanlderResult notNull(String name, Object val) { - if (val == null) { + if (val == null || val.toString().equals("")) { return new ExcelVerifyHanlderResult(false, name + NOT_NULL); } return new ExcelVerifyHanlderResult(true); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/VerifyHandlerServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/VerifyHandlerServer.java index e37ec18..909f870 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/VerifyHandlerServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/verifys/VerifyHandlerServer.java @@ -12,11 +12,16 @@ import org.jeecgframework.poi.handler.inter.IExcelVerifyHandler; * @date 2014年6月29日 下午4:37:56 */ public class VerifyHandlerServer { - - private void addVerifyResult(ExcelVerifyHanlderResult temp, ExcelVerifyHanlderResult result) { - if (!temp.isSuccess()) { + + private final static ExcelVerifyHanlderResult DEFAULT_RESULT = new ExcelVerifyHanlderResult( + true); + + private void addVerifyResult(ExcelVerifyHanlderResult hanlderResult, + ExcelVerifyHanlderResult result) { + if (!hanlderResult.isSuccess()) { result.setSuccess(false); - result.setMsg(result.getMsg() + temp.getMsg()); + result.setMsg((StringUtils.isEmpty(result.getMsg()) ? "" : result.getMsg() + " , ") + + hanlderResult.getMsg()); } } @@ -27,27 +32,24 @@ public class VerifyHandlerServer { * @param value * @param titleString * @param verify - * @param iExcelVerifyHandler + * @param excelVerifyHandler */ public ExcelVerifyHanlderResult verifyData(Object object, Object value, String name, ExcelVerifyEntity verify, - IExcelVerifyHandler iExcelVerifyHandler) { - ExcelVerifyHanlderResult result = new ExcelVerifyHanlderResult(true, ""); + IExcelVerifyHandler excelVerifyHandler) { if (verify == null) { - return result; + return DEFAULT_RESULT; + } + ExcelVerifyHanlderResult result = new ExcelVerifyHanlderResult(true, ""); + if (verify.isNotNull()) { + addVerifyResult(BaseVerifyHandler.notNull(name, value), result); } if (verify.isEmail()) { addVerifyResult(BaseVerifyHandler.isEmail(name, value), result); } - if (verify.isInterHandler()) { - addVerifyResult(iExcelVerifyHandler.verifyHandler(object, name, value), result); - } if (verify.isMobile()) { addVerifyResult(BaseVerifyHandler.isMobile(name, value), result); } - if (verify.isNotNull()) { - addVerifyResult(BaseVerifyHandler.notNull(name, value), result); - } if (verify.isTel()) { addVerifyResult(BaseVerifyHandler.isTel(name, value), result); } @@ -62,6 +64,9 @@ public class VerifyHandlerServer { BaseVerifyHandler.regex(name, value, verify.getRegex(), verify.getRegexTip()), result); } + if (verify.isInterHandler()) { + addVerifyResult(excelVerifyHandler.verifyHandler(object, name, value), result); + } return result; } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.java b/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.java index 86c5609..941052f 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.java @@ -7,7 +7,7 @@ package org.jeecgframework.poi.exception.excel.enums; */ public enum ExcelImportEnum { - GET_VALUE_ERROR("Excel 值获取失败"); + GET_VALUE_ERROR("Excel 值获取失败"), VERIFY_ERROR("值校验失败"); private String msg; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java index a705db4..fe41ac3 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java @@ -44,7 +44,6 @@ public class ParseWord07 { * @param currentRun * @throws Exception */ - @SuppressWarnings("deprecation") private void addAnImage(WordImageEntity obj, XWPFRun currentRun) throws Exception { Object[] isAndType = POIPublicUtil.getIsAndType(obj); String picId; diff --git a/easypoi-test/.classpath b/easypoi-test/.classpath index 7fbaeee..cd3f839 100644 --- a/easypoi-test/.classpath +++ b/easypoi-test/.classpath @@ -1,13 +1,13 @@ - + - + diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/.gitignore b/easypoi-test/src/main/java/org/jeecgframework/poi/test/.gitignore new file mode 100644 index 0000000..d4e38ae --- /dev/null +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/.gitignore @@ -0,0 +1 @@ +/read diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/UtilTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/UtilTest.java similarity index 85% rename from easypoi-test/src/main/java/org/jeecgframework/poi/UtilTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/UtilTest.java index ae2b251..f1fe366 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/UtilTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/UtilTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi; +package org.jeecgframework.poi.test; public class UtilTest { diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/CourseEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/CourseEntity.java similarity index 94% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/CourseEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/CourseEntity.java index 0c2680f..9fc58c5 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/CourseEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/CourseEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity; +package org.jeecgframework.poi.test.entity; import java.util.List; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/ExcelVerifyEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/ExcelVerifyEntity.java new file mode 100644 index 0000000..d513cac --- /dev/null +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/ExcelVerifyEntity.java @@ -0,0 +1,124 @@ +package org.jeecgframework.poi.test.entity; + +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecgframework.poi.excel.annotation.ExcelVerify; + +/** + * Excel导入校验类 + * @author JueYue + * @date 2015年2月24日 下午2:21:07 + */ +public class ExcelVerifyEntity { + + /** + * Email校验 + */ + @Excel(name = "Email", width = 25) + @ExcelVerify(isEmail = true, notNull = true) + private String email; + /** + * 手机号校验 + */ + @Excel(name = "Mobile", width = 20) + @ExcelVerify(isMobile = true, notNull = true) + private String mobile; + /** + * 电话校验 + */ + @Excel(name = "Tel", width = 20) + @ExcelVerify(isTel = true, notNull = true) + private String tel; + /** + * 最长校验 + */ + @Excel(name = "MaxLength") + @ExcelVerify(maxLength = 15) + private String maxLength; + /** + * 最短校验 + */ + @Excel(name = "MinLength") + @ExcelVerify(minLength = 3) + private String minLength; + /** + * 非空校验 + */ + @Excel(name = "NotNull") + @ExcelVerify(notNull = true) + private String notNull; + /** + * 正则校验 + */ + @Excel(name = "Regex") + @ExcelVerify(regex = "[\u4E00-\u9FA5]*", regexTip = "不是中文") + private String regex; + /** + * 接口校验 + */ + private String interHandler; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getMaxLength() { + return maxLength; + } + + public void setMaxLength(String maxLength) { + this.maxLength = maxLength; + } + + public String getMinLength() { + return minLength; + } + + public void setMinLength(String minLength) { + this.minLength = minLength; + } + + public String getNotNull() { + return notNull; + } + + public void setNotNull(String notNull) { + this.notNull = notNull; + } + + public String getRegex() { + return regex; + } + + public void setRegex(String regex) { + this.regex = regex; + } + + public String getInterHandler() { + return interHandler; + } + + public void setInterHandler(String interHandler) { + this.interHandler = interHandler; + } + +} diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/MsgClient.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/MsgClient.java similarity index 94% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/MsgClient.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/MsgClient.java index 7c54590..ec046a0 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/MsgClient.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/MsgClient.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity; +package org.jeecgframework.poi.test.entity; import java.util.Date; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/MsgClientGroup.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/MsgClientGroup.java similarity index 92% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/MsgClientGroup.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/MsgClientGroup.java index e153846..94501ea 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/MsgClientGroup.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/MsgClientGroup.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity; +package org.jeecgframework.poi.test.entity; import java.io.Serializable; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/StudentEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/StudentEntity.java similarity index 93% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/StudentEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/StudentEntity.java index afc4ef2..705ea6a 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/StudentEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/StudentEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity; +package org.jeecgframework.poi.test.entity; import java.util.Date; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/TeacherEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java similarity index 93% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/TeacherEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java index 1398f94..ee38a42 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/TeacherEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity; +package org.jeecgframework.poi.test.entity; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelTarget; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/TestEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TestEntity.java similarity index 86% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/TestEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TestEntity.java index fe95160..6bb625d 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/TestEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TestEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity; +package org.jeecgframework.poi.test.entity; import org.jeecgframework.poi.excel.annotation.Excel; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/statistics/StatisticEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/statistics/StatisticEntity.java similarity index 92% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/statistics/StatisticEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/statistics/StatisticEntity.java index af9e171..3848c9f 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/statistics/StatisticEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/statistics/StatisticEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity.statistics; +package org.jeecgframework.poi.test.entity.statistics; import java.math.BigDecimal; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/BudgetAccountsEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/BudgetAccountsEntity.java similarity index 86% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/BudgetAccountsEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/BudgetAccountsEntity.java index 53f9b3c..a3be7ac 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/BudgetAccountsEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/BudgetAccountsEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity.temp; +package org.jeecgframework.poi.test.entity.temp; import org.jeecgframework.poi.excel.annotation.Excel; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/PayeeEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/PayeeEntity.java similarity index 89% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/PayeeEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/PayeeEntity.java index caa5012..1fa4919 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/PayeeEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/PayeeEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity.temp; +package org.jeecgframework.poi.test.entity.temp; import org.jeecgframework.poi.excel.annotation.Excel; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/TemplateExcelExportEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/TemplateExcelExportEntity.java similarity index 94% rename from easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/TemplateExcelExportEntity.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/TemplateExcelExportEntity.java index 7eae0f1..b33914f 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/temp/TemplateExcelExportEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/temp/TemplateExcelExportEntity.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.entity.temp; +package org.jeecgframework.poi.test.entity.temp; import java.io.Serializable; import java.util.List; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/doc/exportTemp.xls b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/doc/exportTemp.xls similarity index 100% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/doc/exportTemp.xls rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/doc/exportTemp.xls diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/doc/专项支出用款申请书.xls b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/doc/专项支出用款申请书.xls similarity index 100% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/doc/专项支出用款申请书.xls rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/doc/专项支出用款申请书.xls diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/template/TemplateExcelExportTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/template/TemplateExcelExportTest.java similarity index 88% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/template/TemplateExcelExportTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/template/TemplateExcelExportTest.java index 1fc6ebd..98f613a 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/template/TemplateExcelExportTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/template/TemplateExcelExportTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.template; +package org.jeecgframework.poi.test.excel.template; import static org.junit.Assert.*; @@ -11,15 +11,15 @@ import java.util.List; import java.util.Map; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.entity.statistics.StatisticEntity; -import org.jeecgframework.poi.entity.temp.BudgetAccountsEntity; -import org.jeecgframework.poi.entity.temp.PayeeEntity; -import org.jeecgframework.poi.entity.temp.TemplateExcelExportEntity; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.TemplateExportParams; import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerBorderImpl; import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerColorImpl; import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerDefaultImpl; +import org.jeecgframework.poi.test.entity.statistics.StatisticEntity; +import org.jeecgframework.poi.test.entity.temp.BudgetAccountsEntity; +import org.jeecgframework.poi.test.entity.temp.PayeeEntity; +import org.jeecgframework.poi.test.entity.temp.TemplateExcelExportEntity; import org.junit.Test; import com.google.common.collect.Lists; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/CourseHanlder.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/CourseHanlder.java similarity index 88% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/CourseHanlder.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/CourseHanlder.java index 8a12ffa..6861af4 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/CourseHanlder.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/CourseHanlder.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import org.jeecgframework.poi.handler.impl.ExcelDataHandlerDefaultImpl; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportForMap.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportForMap.java similarity index 95% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportForMap.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportForMap.java index af8b591..982c11f 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportForMap.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportForMap.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportMsgClient.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportMsgClient.java similarity index 86% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportMsgClient.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportMsgClient.java index b2aba92..e2c12f8 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportMsgClient.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportMsgClient.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import static org.junit.Assert.*; @@ -10,13 +10,13 @@ import java.util.Date; import java.util.List; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.entity.CourseEntity; -import org.jeecgframework.poi.entity.MsgClient; -import org.jeecgframework.poi.entity.MsgClientGroup; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.entity.vo.PoiBaseConstants; +import org.jeecgframework.poi.test.entity.CourseEntity; +import org.jeecgframework.poi.test.entity.MsgClient; +import org.jeecgframework.poi.test.entity.MsgClientGroup; import org.junit.Test; /** * 当行大数据量测试 diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportStatisticTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportStatisticTest.java similarity index 90% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportStatisticTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportStatisticTest.java index d095ab4..1319f03 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportStatisticTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportStatisticTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import java.io.File; import java.io.FileOutputStream; @@ -8,12 +8,12 @@ import java.util.Date; import java.util.List; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.entity.statistics.StatisticEntity; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelStyleType; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.entity.vo.PoiBaseConstants; +import org.jeecgframework.poi.test.entity.statistics.StatisticEntity; import org.junit.Test; public class ExcelExportStatisticTest { diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportTemplateTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java similarity index 91% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportTemplateTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java index 87eca1b..e9ad8d9 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportTemplateTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import java.io.File; import java.io.FileOutputStream; @@ -9,12 +9,12 @@ import java.util.List; import java.util.Map; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.entity.CourseEntity; -import org.jeecgframework.poi.entity.StudentEntity; -import org.jeecgframework.poi.entity.TeacherEntity; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.TemplateExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelStyleType; +import org.jeecgframework.poi.test.entity.CourseEntity; +import org.jeecgframework.poi.test.entity.StudentEntity; +import org.jeecgframework.poi.test.entity.TeacherEntity; import org.junit.Before; import org.junit.Test; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilDataHandlerTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilDataHandlerTest.java similarity index 88% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilDataHandlerTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilDataHandlerTest.java index c0fad33..a3c93d7 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilDataHandlerTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilDataHandlerTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import java.io.FileOutputStream; import java.util.ArrayList; @@ -7,11 +7,11 @@ import java.util.List; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.entity.CourseEntity; -import org.jeecgframework.poi.entity.StudentEntity; -import org.jeecgframework.poi.entity.TeacherEntity; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.test.entity.CourseEntity; +import org.jeecgframework.poi.test.entity.StudentEntity; +import org.jeecgframework.poi.test.entity.TeacherEntity; import org.junit.Before; import org.junit.Test; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilIdTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilIdTest.java similarity index 88% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilIdTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilIdTest.java index 9267843..8b105ae 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilIdTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilIdTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import java.io.FileOutputStream; import java.util.ArrayList; @@ -7,11 +7,11 @@ import java.util.List; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.entity.CourseEntity; -import org.jeecgframework.poi.entity.StudentEntity; -import org.jeecgframework.poi.entity.TeacherEntity; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.test.entity.CourseEntity; +import org.jeecgframework.poi.test.entity.StudentEntity; +import org.jeecgframework.poi.test.entity.TeacherEntity; import org.junit.Before; import org.junit.Test; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilTest.java similarity index 92% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilTest.java index 9ff00d2..b8d70d1 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportUtilTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.test; +package org.jeecgframework.poi.test.excel.test; import java.io.File; import java.io.FileOutputStream; @@ -8,13 +8,13 @@ import java.util.HashMap; import java.util.List; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.entity.CourseEntity; -import org.jeecgframework.poi.entity.StudentEntity; -import org.jeecgframework.poi.entity.TeacherEntity; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.TemplateExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; +import org.jeecgframework.poi.test.entity.CourseEntity; +import org.jeecgframework.poi.test.entity.StudentEntity; +import org.jeecgframework.poi.test.entity.TeacherEntity; import org.junit.Before; import org.junit.Test; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtilTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/read/ExcelImportUtilTest.java similarity index 86% rename from easypoi-test/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtilTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/read/ExcelImportUtilTest.java index 7675824..31f4cbf 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtilTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/read/ExcelImportUtilTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel; +package org.jeecgframework.poi.test.read; import java.io.File; import java.io.FileInputStream; @@ -8,10 +8,11 @@ import java.util.List; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.jeecgframework.poi.entity.CourseEntity; -import org.jeecgframework.poi.entity.TestEntity; -import org.jeecgframework.poi.entity.statistics.StatisticEntity; +import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.test.entity.CourseEntity; +import org.jeecgframework.poi.test.entity.TestEntity; +import org.jeecgframework.poi.test.entity.statistics.StatisticEntity; import org.junit.Test; public class ExcelImportUtilTest { diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilAnnExcelTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilAnnExcelTest.java similarity index 89% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilAnnExcelTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilAnnExcelTest.java index 577d371..fad71a7 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilAnnExcelTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilAnnExcelTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.word; +package org.jeecgframework.poi.test.word; import java.io.FileOutputStream; import java.text.SimpleDateFormat; @@ -9,10 +9,11 @@ import java.util.List; import java.util.Map; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.jeecgframework.poi.entity.CourseEntity; -import org.jeecgframework.poi.entity.StudentEntity; -import org.jeecgframework.poi.entity.TeacherEntity; -import org.jeecgframework.poi.word.entity.Person; +import org.jeecgframework.poi.test.entity.CourseEntity; +import org.jeecgframework.poi.test.entity.StudentEntity; +import org.jeecgframework.poi.test.entity.TeacherEntity; +import org.jeecgframework.poi.test.word.entity.Person; +import org.jeecgframework.poi.word.WordExportUtil; import org.jeecgframework.poi.word.entity.params.ExcelListEntity; import org.junit.Before; import org.junit.Test; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilBaseExcelTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilBaseExcelTest.java similarity index 91% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilBaseExcelTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilBaseExcelTest.java index e915a5c..2f34a2d 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilBaseExcelTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilBaseExcelTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.word; +package org.jeecgframework.poi.test.word; import java.io.FileOutputStream; import java.text.SimpleDateFormat; @@ -9,7 +9,8 @@ import java.util.List; import java.util.Map; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.jeecgframework.poi.word.entity.Person; +import org.jeecgframework.poi.test.word.entity.Person; +import org.jeecgframework.poi.word.WordExportUtil; import org.jeecgframework.poi.word.entity.WordImageEntity; import org.junit.Test; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilTest.java similarity index 92% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilTest.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilTest.java index af4292a..20299f3 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/word/WordExportUtilTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/WordExportUtilTest.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.word; +package org.jeecgframework.poi.test.word; import java.io.FileOutputStream; import java.text.SimpleDateFormat; @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.jeecgframework.poi.word.WordExportUtil; import org.jeecgframework.poi.word.entity.WordImageEntity; import org.junit.Test; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/Excel.docx b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/Excel.docx similarity index 100% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/Excel.docx rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/Excel.docx diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/Image.docx b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/Image.docx similarity index 100% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/Image.docx rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/Image.docx diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/Simple.docx b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/Simple.docx similarity index 100% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/Simple.docx rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/Simple.docx diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/SimpleExcel.docx b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/SimpleExcel.docx similarity index 100% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/doc/SimpleExcel.docx rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/doc/SimpleExcel.docx diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/entity/Person.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/entity/Person.java similarity index 88% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/entity/Person.java rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/entity/Person.java index 01f31a1..6cbf254 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/word/entity/Person.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/entity/Person.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.word.entity; +package org.jeecgframework.poi.test.word.entity; import org.jeecgframework.poi.excel.annotation.Excel; diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/word/img/testCode.png b/easypoi-test/src/main/java/org/jeecgframework/poi/test/word/img/testCode.png similarity index 100% rename from easypoi-test/src/main/java/org/jeecgframework/poi/word/img/testCode.png rename to easypoi-test/src/main/java/org/jeecgframework/poi/test/word/img/testCode.png