升级POI版本到4.0.1

MatrixSeven · MatrixSeven · commit 08abea54ab30 · 2019-06-26T21:39:09.000+08:00
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 <dependency>
   <groupId>com.github.matrixseven</groupId>
   <artifactId>ExcelReads</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </dependency>
 
 ```
diff --git a/pom.xml b/pom.xml
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.matrixseven</groupId>
 	<artifactId>ExcelReads</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<name>ExcelReads</name>
 	<description>A ExcelReads Utils By Seven</description>
 	<url>https://github.com/MatrixSeven/ExcelReads</url>
@@ -38,18 +38,18 @@
 		</repository>
 	</distributionManagement>
 
-	<dependencies>
 
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
-			<version>3.15</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>3.15</version>
-		</dependency>
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.0.1</version>
+        </dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/src/main/java/seven/wapperInt/Wrapper.java b/src/main/java/seven/wapperInt/Wrapper.java
@@ -41,15 +41,16 @@
 public abstract class Wrapper<T> implements Serializable, ExcelSuperInterface {
     protected Config config = new Config();
     protected DecimalFormat df = new DecimalFormat("0");
+    private static final String BLANK="";
 
     protected String getCellFormatValue(Cell cell) {
         String cellValue;
         if (cell != null) {
             switch (cell.getCellType()) {
-                case Cell.CELL_TYPE_NUMERIC:
+                case NUMERIC:
                     cellValue = df.format(cell.getNumericCellValue());
                     break;
-                case Cell.CELL_TYPE_FORMULA: {
+                case FORMULA: {
                     if (HSSFDateUtil.isCellDateFormatted(cell)) {
                         Date date = cell.getDateCellValue();
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -59,20 +60,16 @@ protected String getCellFormatValue(Cell cell) {
                     }
                     break;
                 }
-                case Cell.CELL_TYPE_BLANK:
-                    cellValue = " ";
-                    break;
-                case Cell.CELL_TYPE_STRING:
+                case STRING:
                     cellValue = cell.getStringCellValue();
                     break;
-                case Cell.CELL_TYPE_ERROR:
-                    cellValue = " ";
-                    break;
+                case ERROR:
+                case BLANK:
                 default:
-                    cellValue = " ";
+                    cellValue = BLANK;
             }
         } else {
-            cellValue = "";
+            cellValue = BLANK;
         }
         return cellValue;
     }
@@ -88,13 +85,12 @@ public Wrapper(Consumer<Config> consumer) {
      * @return List
      * @throws Exception
      */
-    public abstract  List<T> Create() throws Exception;
-
+    public abstract List<T> Create() throws Exception;
 
-    public abstract List<Map<String,String>> CreateMap() throws Exception;
 
-    public abstract Map<String,Map<String,String>> CreateMap(String key) throws Exception;
+    public abstract List<Map<String, String>> CreateMap() throws Exception;
 
+    public abstract Map<String, Map<String, String>> CreateMap(String key) throws Exception;
 
 
     /**
diff --git a/src/main/java/seven/wapperInt/wapperRef/sysWppers/ResWrapperMap.java b/src/main/java/seven/wapperInt/wapperRef/sysWppers/ResWrapperMap.java
@@ -1,14 +1,13 @@
 package seven.wapperInt.wapperRef.sysWppers;
 
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import seven.config.Config;
 import seven.util.ExcelTool;
 import seven.util.RegHelper;
-import seven.config.Config;
 import seven.wapperInt.wapperRef.WrapperObj;
 
 import java.util.*;
@@ -106,18 +105,20 @@ protected <T> T RefResWrapper(String fs, boolean isMap, String key) throws Excep
                     } catch (Exception e) {
                         logger.error("列表长度小于实际列长度 startSheet:{},sheetName:{}, row:{}", start_sheet, sheet.getSheetName(), rowNum);
                     }
-                    for (int j = 0, colNum = row.getPhysicalNumberOfCells(); j < colNum; j++) {
-                        if (require != null && !(require[j].equals("Null")) && filterColByKey.contains(titles[j])) {
+                    for (int j = 0, colNum = row.getPhysicalNumberOfCells(); j < colNum&&j<titles.length; j++) {
+                        if (require != null && !(require[j].equals("Null")) && !filterColByKey.contains(titles[j])) {
                             if (RegHelper.require(require[j], getCellFormatValue(row.getCell((short) j)))) {
                                 map.put(titles[j], getCellFormatValue(row.getCell((short) j)));
                             } else {
                             }
                         } else {
-                            map.put(titles[j], getCellFormatValue(row.getCell((short) j)));
+                            if(!filterColByKey.contains(titles[j])) {
+                                map.put(titles[j], getCellFormatValue(row.getCell((short) j)));
+                            }
                         }
                     }
                     if (!isNull(map))
-                        if (this.filter.test(map)) {
+                        if (!this.filter.test(map)) {
                             continue;
                         }
                     this.process.accept(map);
diff --git a/src/test/java/Demo.java b/src/test/java/Demo.java
@@ -17,6 +17,7 @@
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.util.StringUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.BlockJUnit4ClassRunner;
@@ -36,18 +37,17 @@ public class Demo {
     @Test
     public void Test_01() throws Exception {
 
-        String filePath = System.getProperty("user.dir").concat("/测试.xls");
-        String filePath2 = System.getProperty("user.dir").concat("/seven.xlsx");
+        String filePath = System.getProperty("user.dir").concat("/test.xlsx");
 
         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();
+                .MakeMap(it -> it.vocSize(1999).title(0).content(2).isLoopSheet(true)))
+                .Filter(it->it.get("Run").equals("Y"))
+                .Filter(it->!it.getOrDefault("Test"," ").equals(" "))
+                .Create();
 
         System.out.println(list);
 
+        String filePath2 = System.getProperty("user.dir").concat("/seven.xlsx");
         List<A> create = ExcelFactory.getBeans(filePath2, WrapperFactory.<A>MakeObj(it -> it.vocSize(1999)
                 .title(0).content(1), A.class))
                 .Filter(it -> it.getA().equals(""))
@@ -88,13 +88,7 @@ public void Test_02() throws Exception {
         ExcelFactory.saveExcel(m, System.getProperty("user.dir").concat("/SaveMap_.xlsx"))
                 .SetCellStyle("A", cellStyle -> cellStyle
                         .setFillPattern(FillPatternType.DIAMONDS)
-                        .setAlignment(HorizontalAlignment.RIGHT)
-                        .setFillForegroundColor(HSSFColor.WHITE.index)
-                        .setBottomBorderColor(HSSFColor.RED.index)
-                        .setFillBackgroundColor(HSSFColor.GOLD.index)
-                        .setRightBorderColor(HSSFColor.INDIGO.index))
-                .ConvertName("A", "我的世界")
-                .Flush();
+                        .setAlignment(HorizontalAlignment.RIGHT)).Flush();
 
     }
 }
