fix-bug

Author: MatrixSeven

README.md

@@ -2,7 +2,8 @@
 
 ![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)
 ![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven/job/master.svg?style=flat-square)
-
+![language](https://img.shields.io/badge/language-java-orange.svg)
+![last_release](https://img.shields.io/badge/release-1.0.3-green)
 ## ExcelReads是什么?
 * 这是一个通用的简单的Excel读取器
 * 支持自定义JavaBean实体读取和HashMap自动读取
@@ -18,14 +19,22 @@
 <dependency>
   <groupId>com.github.matrixseven</groupId>
   <artifactId>ExcelReads</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3</version>
 </dependency>
 
+
+
 ```
 
 ## [更新日志详见:UpdateLogs.md](UPDATELOG.MD)
 ###最近三次更新:
 
+
+#### 更新2019/12/2　
+* 替换导出方式
+* 增加 Create/CreateLoop[Map|Obj]
+* 更新顶层接口
+
 #### 更新2019/4/26　(诈尸更新)
 * 更加完善的类型推导，书写更方便(Great!!!)
 * 修复增加过滤列无法读取数据bug
@@ -37,12 +46,6 @@
 * 增加AnyCol来对应FilterCol方法，只保留AnyCol类列
 * 增加SetCellStyle，突破CellStyle绑定wk约束，链式设置列单元格风格（非常狗血）
 
-#### 更新2017/01/09
-* 增加SetPath方法，随时切换保存路径
-* 增加ConvertName方法，方便自定义Excel列名称
-* 增加Flush方法，不在建议使用~~Save(@Deprecated)~~方法进行保存输出
-* 增加SetOutputStream方法，可以放入自定义流，用于支持网页Response输出
-* 处理一些小bug，完善异常提示信息
 
 ### 其他
 * 自定义读取支持出简单的规范化数据格式，即典型的表头格式
@@ -64,22 +67,31 @@
 
 * 喜大若奔（。・・）ノ　Filter/Sort等lambda操作不用在声明类型(~~还是要写一个泛型~~)
 ```java
-//读取到Map类型
-//使用 .CreateMap(key_v) 生成Map<Key,Map>类型数据
-List<Map<String, String>> list = ExcelFactory.getBeans(filePath, WrapperFactory
-    .MakeMap(it -> it.vocSize(1999).title(2).content(3)))
-    .Filter(it -> !it.get("服务IP").contains("12"))
-    .Process(it -> it.put("add", "这个是我增加的"))
-    .FilterCol(df -> df.add("连接类型"))
-    .CreateMap();
-
-//读取到自定义JavaBean类型
-List<A> create = ExcelFactory.getBeans(filePath2, WrapperFactory.<A>MakeObj(it -> it.vocSize(1999)
-    .title(0).content(1), A.class))
-    .Filter(it -> it.getA().equals(""))
-    .FilterCol(it -> it.add("1"))
-    .Sort(Comparator.comparing(A::getA))
-    .Create();
+    //CreateMapLoop 多sheet|isLoopSheet
+    Map<String, Map<String, String>> maps = ExcelFactory.getMaps(filePath, it -> it.vocSize(1999)
+            .title(2)
+            .content(3)
+            .isLoopSheet(true))
+            .Filter(it -> it.get("在线人数").equals("43"))
+            .CreateMapLoop();
+    //CreateMap 单个
+    List<Map<String, String>> maps2 = ExcelFactory.getMaps(filePath, it -> it.vocSize(1999)
+            .title(2)
+            .content(3))
+            .Filter(it -> it.get("在线人数").equals("43"))
+            .CreateMap();
+    //Create Obj
+    List<B> create = ExcelFactory.<B>getBeans(B.class, filePath, it -> it.title(2)
+            .content(3)).Create();
+    System.out.println(create);
+    //CreateObjLoop
+    String filePath2 = System.getProperty("user.dir").concat("/seven.xlsx");
+    Map<String, List<A>> stringListMap = ExcelFactory.<A>getBeans(A.class, filePath2,
+            it -> it.withConvert("姓名", ConvertTest.class)
+                    .isLoopSheet(true)
+                    .withConvert("姓名", f -> f.toString().concat("111111111")))
+            .Process(a -> a.setA(a.getA() + "fuck"))
+            .CreateObjLoop();
 ```
 ## 数据库导出自定义Bean类型写法（xxx.Class类型）
 ```java
@@ -117,4 +129,8 @@ ExcelFactory.saveExcel(ps.executeQuery()).SetPath("seven.xlsx")
 * 邮件(hacker.kill07@gmail.com)
 * QQ: 985390927
 * weibo: [@Alden_情绪控](http://weibo.com/Sweets07)
-* Blog: [http://blog.52python.cn](http://blog.52python.cn)
+* Blog: [http://blog.52python.cn](http://blog.52python.cn)
+
+## Acknowledgement
+特别感谢 [JetBrains](https://www.jetbrains.com/?from=matrixSeven) 为开源项目提供免费的 [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=matrixSeven) 等 IDE 的授权  
+[<img src="jetbrains-variant-3.png" width="200"/>](https://www.jetbrains.com/?from=matrixSeven)

UPDATELOG.MD

@@ -1,5 +1,12 @@
 ## 更新纪录
 
+#### 更新2017/01/09
+* 增加SetPath方法，随时切换保存路径
+* 增加ConvertName方法，方便自定义Excel列名称
+* 增加Flush方法，不在建议使用~~Save(@Deprecated)~~方法进行保存输出
+* 增加SetOutputStream方法，可以放入自定义流，用于支持网页Response输出
+* 处理一些小bug，完善异常提示信息
+
 ### 更新2017/01/06
 * 整合注解，导出和读取使用同一个ExcelAnno注解
 * 统一编码为UTF-8

jetbrains-variant-3.png

@@ -4,7 +4,7 @@
 	<groupId>com.github.matrixseven</groupId>
 	<artifactId>ExcelReads</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.2</version>
+	<version>1.0.3</version>
 	<name>ExcelReads</name>
 	<description>A ExcelReads Utils By Seven</description>
 	<url>https://github.com/MatrixSeven/ExcelReads</url>

pom.xml

@@ -24,8 +24,8 @@ public class Config {
     private Integer endSheet = null;
     private Integer sheetIndex = -1;
     private String sheetName = null;
-    private Map<String, Class<? extends ConvertInterface>> convertMap = new HashMap<>();
-    private Map<String, ConvertInterface> convertMapImpl = new HashMap<>();
+    private Map<String, Class<? extends ConvertInterface<?>>> convertMap = new HashMap<>();
+    private Map<String, ConvertInterface<?>> convertMapImpl = new HashMap<>();
 
     public Config() {
     }
@@ -86,7 +86,7 @@ public Config setErrorLog(Boolean errorLog) {
     }
 
     @Deprecated
-    public Config withConvert(String name, Class<? extends ConvertInterface> clazz) {
+    public Config withConvert(String name, Class<? extends ConvertInterface<?>> clazz) {
         this.convertMap.put(name, clazz);
         return this;
     }
@@ -97,7 +97,7 @@ public Config withConvert(String name, Class<? extends ConvertInterface> clazz)
      * @return
      */
     @Deprecated
-    public Config withConvert(String name, ConvertInterface convert) {
+    public Config withConvert(String name, ConvertInterface<?> convert) {
         this.convertMapImpl.put(name, convert);
         return this;
     }
@@ -161,11 +161,11 @@ public Integer getContentRowEnd() {
         return contentRowEnd;
     }
 
-    public Map<String, Class<? extends ConvertInterface>> getConvertMap() {
+    public Map<String, Class<? extends ConvertInterface<?>>> getConvertMap() {
         return convertMap;
     }
 
-    public Map<String, ConvertInterface> getConvertMapImpl() {
+    public Map<String, ConvertInterface<?>> getConvertMapImpl() {
         return convertMapImpl;
     }
 

src/main/java/seven/config/Config.java

@@ -17,11 +17,9 @@
 //=======================================================
 
 import seven.ExcelSuperInterface;
-import seven.config.Config;
 
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 /**
  * @author Seven
@@ -33,5 +31,5 @@ public interface ReaderMap extends ExcelSuperInterface<ReaderMap,Map> {
 
     List<Map<String, String>> CreateMap() throws Exception;
 
-    Map<String, Map<String, String>> CreateMapLoop() throws Exception;
+    Map<String, List<Map<String, String>>> CreateMapLoop() throws Exception;
 }

src/main/java/seven/wapperInt/ReaderMap.java

@@ -32,6 +32,6 @@ public interface ReaderObj<T> extends ExcelSuperInterface<ReaderObj<T>,T> {
 
     List<T> Create() throws Exception;
 
-    Map<String,List<T>> CreateObjLoop() throws Exception;
+    Map<String, List<T>> CreateObjLoop() throws Exception;
 
 }

src/main/java/seven/wapperInt/ReaderObj.java

@@ -21,13 +21,10 @@
 import org.slf4j.LoggerFactory;
 import seven.callBack.DataFilterInterface;
 import seven.callBack.DataFilterProcessInterface;
-import seven.callBack.imp.DefaultDataFilter;
-import seven.callBack.imp.DefaultDataProFilter;
 import seven.wapperInt.ReaderMap;
 import seven.wapperInt.Wrapper;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -93,7 +90,7 @@ public List<Map<String, String>> CreateMap() throws Exception {
     }
 
     @Override
-    public Map<String, Map<String, String>> CreateMapLoop() throws Exception {
+    public Map<String, List<Map<String, String>>> CreateMapLoop() throws Exception {
         if (!config.getIsLoopSheet()) {
             throw new RuntimeException("未开启LoopSheet选项,请使用CreateMap");
         }

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

@@ -21,8 +21,6 @@
 import org.slf4j.LoggerFactory;
 import seven.callBack.DataFilterInterface;
 import seven.callBack.DataFilterProcessInterface;
-import seven.callBack.imp.DefaultDataFilter;
-import seven.callBack.imp.DefaultDataProFilter;
 import seven.wapperInt.ReaderObj;
 import seven.wapperInt.Wrapper;
 

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

@@ -8,7 +8,6 @@
 import seven.util.ExcelTool;
 import seven.util.RegHelper;
 import seven.wapperInt.wapperRef.WrapperMap;
-import seven.wapperInt.wapperRef.WrapperObj;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -45,7 +44,7 @@ public ResWrapperMap(Consumer<seven.config.Config> consumer) {
     @Override
     protected <T> T refResWrapper(String fs, boolean isMap) throws Exception {
         config.check();
-        HashMap<String, Map> maps = null;
+        HashMap<String, List<Map>> maps = null;
         List<Map> list = null;
         //TODO fix
         if (isMap) {