处理一些小问题

Author: MatrixSeven

src/main/java/seven/wapperInt/Wrapper.java

@@ -5,7 +5,7 @@
 import org.apache.poi.ss.usermodel.Cell;
 import seven.wapperInt.callBack.DataFilterColumnInterface;
 import seven.wapperInt.callBack.DataFilterInterface;
-import seven.wapperInt.callBack.DataProcessInterface;
+import seven.wapperInt.callBack.DataFilterProcessInterface;
 
 import java.io.Serializable;
 import java.text.DecimalFormat;
@@ -226,10 +226,10 @@ public void setEnd_sheet(Integer end_sheet) {
 	/**
 	 *此处传入每一行打包好的数据。对应一个实体\n
 	 * 在process方法里可对属性进行处理加工
-	 * @param process {@link DataProcessInterface}
+	 * @param process {@link DataFilterProcessInterface}
 	 * @return
 	 */
-	public abstract Wrapper Process(DataProcessInterface<?> process);
+	public abstract Wrapper Process(DataFilterProcessInterface<?> process);
 
 	/**
 	 *	对结果的List进行排序

src/main/java/seven/wapperInt/callBack/DataFilterColumnInterface.java

@@ -13,5 +13,5 @@ public interface DataFilterColumnInterface {
      * 如果加入后，将不对实体进行赋值
      * @return
      */
-    public String[] Filter();
+    public String[] filter();
 }

…erInt/callBack/DataProcessInterface.java …callBack/DataFilterProcessInterface.javasrc/main/java/seven/wapperInt/callBack/DataProcessInterface.java renamed to src/main/java/seven/wapperInt/callBack/DataFilterProcessInterface.java src/main/java/seven/wapperInt/callBack/DataProcessInterface.java renamed to src/main/java/seven/wapperInt/callBack/DataFilterProcessInterface.java

@@ -9,7 +9,7 @@
  * 此处传入每一行打包好的数据。对应一个实体
  * T为实体Bean类型
  */
-public interface DataProcessInterface<T>{
+public interface DataFilterProcessInterface<T>{
     /***
      * 此处传入每一行打包好的数据。对应一个实体，
      * 在process方法里可对属性进行处理加工

…erInt/callBack/imp/DefaultDataFiter.java …rInt/callBack/imp/DefaultDataFilter.javasrc/main/java/seven/wapperInt/callBack/imp/DefaultDataFiter.java renamed to src/main/java/seven/wapperInt/callBack/imp/DefaultDataFilter.java src/main/java/seven/wapperInt/callBack/imp/DefaultDataFiter.java renamed to src/main/java/seven/wapperInt/callBack/imp/DefaultDataFilter.java

@@ -7,7 +7,7 @@
  * [Bolg]https://matrixseven.github.io/
  * Created by seven on 2016/10/18.
  */
-public class DefaultDataFiter<T> implements DataFilterInterface<T>{
+public class DefaultDataFilter<T> implements DataFilterInterface<T>{
     @Override
     public Boolean filter(T o) {
         return true;

…pperInt/callBack/imp/DefaultProcess.java …t/callBack/imp/DefaultDataProFilter.javasrc/main/java/seven/wapperInt/callBack/imp/DefaultProcess.java renamed to src/main/java/seven/wapperInt/callBack/imp/DefaultDataProFilter.java src/main/java/seven/wapperInt/callBack/imp/DefaultProcess.java renamed to src/main/java/seven/wapperInt/callBack/imp/DefaultDataProFilter.java

@@ -1,14 +1,14 @@
 package seven.wapperInt.callBack.imp;
 
-import seven.wapperInt.callBack.DataProcessInterface;
+import seven.wapperInt.callBack.DataFilterProcessInterface;
 
 /**
  * [Github]https://github.com/MatrixSeven
  * [Bolg]https://matrixseven.github.io/
  * Created by seven on 2016/10/18.
  */
 @SuppressWarnings("unchecked")
-public class DefaultProcess<T> implements DataProcessInterface<T>{
+public class DefaultDataProFilter<T> implements DataFilterProcessInterface<T> {
     @Override
     public void process(T o) {
 

…nt/callBack/imp/DefaultDateColFiter.java …t/callBack/imp/DefaultDateColFilter.javasrc/main/java/seven/wapperInt/callBack/imp/DefaultDateColFiter.java renamed to src/main/java/seven/wapperInt/callBack/imp/DefaultDateColFilter.java src/main/java/seven/wapperInt/callBack/imp/DefaultDateColFiter.java renamed to src/main/java/seven/wapperInt/callBack/imp/DefaultDateColFilter.java

@@ -7,10 +7,10 @@
  * [Bolg]https://matrixseven.github.io/
  * Created by seven on 2016/10/19.
  */
-public class DefaultDateColFiter implements DataFilterColumnInterface {
+public class DefaultDateColFilter implements DataFilterColumnInterface {
 
     @Override
-    public String[] Filter() {
+    public String[] filter() {
         return new String[0];
     }
 }

src/main/java/seven/wapperInt/wapperRef/WrapperObj.java

@@ -25,9 +25,9 @@
 import seven.wapperInt.Wrapper;
 import seven.wapperInt.callBack.DataFilterInterface;
 import seven.wapperInt.callBack.DataFilterColumnInterface;
-import seven.wapperInt.callBack.DataProcessInterface;
-import seven.wapperInt.callBack.imp.DefaultDataFiter;
-import seven.wapperInt.callBack.imp.DefaultProcess;
+import seven.wapperInt.callBack.DataFilterProcessInterface;
+import seven.wapperInt.callBack.imp.DefaultDataFilter;
+import seven.wapperInt.callBack.imp.DefaultDataProFilter;
 
 import java.io.File;
 import java.util.*;
@@ -37,8 +37,8 @@
  * @date   2016年4月12日-下午4:07:57
  */
 public abstract class WrapperObj<T> extends Wrapper {
-	protected DataFilterInterface filter=new DefaultDataFiter<Object>();
-	protected DataProcessInterface process=new DefaultProcess<Object>();
+	protected DataFilterInterface filter=new DefaultDataFilter<Object>();
+	protected DataFilterProcessInterface process=new DefaultDataProFilter<Object>();
 	protected List<String> filterColBy_key=new ArrayList<>();
 	protected List<String> filterColBy_value=new ArrayList<>();
 	protected Comparator<? super Object> c;
@@ -58,7 +58,7 @@ protected boolean isNull(Map<String, String> map) {
 
 
 	public Wrapper FilterCol(DataFilterColumnInterface df) {
-		for (String s:df.Filter() ) {
+		for (String s:df.filter() ) {
 			filterColBy_key.add(s);
 		}
 		return this;
@@ -103,7 +103,7 @@ public  <T> T  CreateMap(String key)throws Exception {
 	public Wrapper Filter(DataFilterInterface<?> filter) {
 		this.filter = filter;return this;
 	}
-	public Wrapper Process(DataProcessInterface<?> process) {
+	public Wrapper Process(DataFilterProcessInterface<?> process) {
 		this.process = process;return this;
 	}
 }

src/main/java/seven/wapperInt/wapperRef/sysWppers/ResWrapperMap.java

@@ -18,6 +18,7 @@
 //		   .--(^)(^^)---/#\
 //		 .' @          /###\
 //		 :         ,   #####
+//		 :         ,   #####
 //		  `-..__.-' _.-\###/
 //		        `;_:    `"'
 //		      .'"""""`.

src/test/java/Demo.java

@@ -34,17 +34,21 @@
 public class Demo {
     @Test
     public void Test_01() throws Exception {
-        getBeans(System.getProperty("user.dir").concat("\\测试.xls"),
+        ExcelFactory.getBeans(System.getProperty("user.dir").concat("\\测试.xls"),
                 new ResWrapperMap() {
                     @Override
                     protected void LoadConfig(Config config) {
                         config.setContent_row_start(3);
                         config.setTitle_row(2);
                     }
-                }).
+                }).//这里能够处理每一行数据
                 Process((HashMap<String, String> o) -> System.out.println(o + "\n")
+                //这里能够处理时候过滤某一列
                 ).FilterCol(() -> new String[]{}
-        ).Filter((HashMap<String, String> o) -> o.get("创建人") != null && o.get("创建人").length() > 5).Create();
+                //这里能根据某一行的某一列的内容来取舍这行数据
+        ).Filter((HashMap<String, String> o) -> o.get("创建人") != null && o.get("创建人").length() > 5
+                //排序
+        ).Sort((o1, o2) -> o1.hashCode()>o2.hashCode()?1:hashCode()==o2.hashCode()?0:-1).Create();
 
         System.out.println(
         getBeans(System.getProperty("user.dir").concat("\\测试.xls"),