整合注解，读取和导出使用共同注解

Author: MatrixSeven

ExcelReads.jar

@@ -9,6 +9,11 @@
 * JavaBean实体支持使用注解添加正则规则校验，HashMap支持数组规则校验
 * 依赖POI，使用Maven构建
 
+## 更新纪录
+### 更新2017/01/06
+* 整合注解，使用导出和读取使用同一个ExcelAnno注解
+* 如果不出意外，最后一次更新
+
 ## 更新纪录
 ### 更新2017/01/05
 * 修复据库查询的导出(Object)递归越栈问题

README.md

@@ -1,4 +1,4 @@
-package seven.wapperInt.anno;
+package seven.anno;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -29,6 +29,7 @@
 public @interface ExcelAnno {
 	public String Value()default "Null";
 	public boolean Pass() default false;
-	public String Required() default "Null"; 
+	public String Required() default "Null";
+	public short Align() default 0x2;
 
 }

…java/seven/wapperInt/anno/ExcelAnno.java src/main/java/seven/anno/ExcelAnno.javasrc/main/java/seven/wapperInt/anno/ExcelAnno.java renamed to src/main/java/seven/anno/ExcelAnno.java src/main/java/seven/wapperInt/anno/ExcelAnno.java renamed to src/main/java/seven/anno/ExcelAnno.java

@@ -15,8 +15,8 @@
 //		   (______|______)
 //=======================================================
 
+import seven.anno.ExcelAnno;
 import seven.callBack.PackageDataInterface;
-import seven.savewapper.anno.ExcelAnno;
 import seven.util.ExcelTool;
 
 import java.lang.reflect.Field;
@@ -65,8 +65,8 @@ public ResExprotDBObj CreateList() throws Exception {
             ExcelAnno anno=null;
             for (int i = 0; i < len; i++) {
                 fields[i].setAccessible(true);
-                if((anno=fields[i].getAnnotation(ExcelAnno.class))!=null){
-                    name[i]=anno.value();
+                if((anno=fields[i].getAnnotation(ExcelAnno.class))!=null&&!anno.Value().equals("Null")){
+                    name[i]=anno.Value();
                     continue;
                 }
                 name[i]=fields[i].getName();

src/main/java/seven/savewapper/anno/ExcelAnno.java

@@ -16,7 +16,7 @@
 //=======================================================
 
 import org.apache.poi.ss.usermodel.*;
-import seven.savewapper.anno.ExcelAnno;
+import seven.anno.ExcelAnno;
 import seven.savewapper.wapperRef.SaveExcelObject;
 import seven.util.ExcelTool;
 
@@ -56,9 +56,9 @@ public void Save() throws Exception {
                 continue;
             }
             ea = fields[i].getAnnotation(ExcelAnno.class);
-            if (ea != null) {
-                title[i] = ea.value();
-                align[i] = ea.align();
+            if (ea != null&&!ea.Value().equals("Null")) {
+                title[i] = ea.Value();
+                align[i] = ea.Align();
                 continue;
             }
             title[i] = fields[i].getName();

src/main/java/seven/savewapper/wapperRef/sysWppers/ResExprotDBObj.java

@@ -4,7 +4,7 @@
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import seven.util.ExcelTool;
-import seven.wapperInt.anno.ExcelAnno;
+import seven.anno.ExcelAnno;
 import seven.util.RegHelper;
 import seven.wapperInt.wapperRef.WrapperObj;