From 156ea4dfc67519f17e1eee0c124904fc4f6ca681 Mon Sep 17 00:00:00 2001
From: 王彬 <wangbin@taover.com>
Date: Thu, 26 Sep 2019 18:05:36 +0800
Subject: [PATCH] 1.ExcelUtil update fix bug

---
 build.gradle                                  |  2 +-
 src/main/java/com/taover/util/UtilExcel.java  | 24 ++++++++++++------------
 src/main/java/com/taover/util/UtilString.java |  4 ++++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index c536ea1..ba8452a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '1.1.13'
+                version '1.1.14'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java
index 0ff4c64..7dad60d 100644
--- a/src/main/java/com/taover/util/UtilExcel.java
+++ b/src/main/java/com/taover/util/UtilExcel.java
@@ -10,7 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.Cell;
@@ -290,18 +289,19 @@ public class UtilExcel {
 			for(int j=0; j<lastCellNum; ++j){
 				Cell cell = row.getCell(j);
 				if(cell != null){
-					if(cell.getCellType() == HSSFCell.CELL_TYPE_STRING){
-						dataRow.add(cell.getStringCellValue());	
-					}else if(cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC){
+					CellType currCellType = cell.getCellTypeEnum();
+					
+					if(currCellType.compareTo(CellType.STRING) == 0){
+						dataRow.add(UtilString.trimCodePage(cell.getRichStringCellValue().getString()));	
+					}else if(currCellType.compareTo(CellType.NUMERIC) == 0){
 						dataRow.add(df.format(cell.getNumericCellValue()));
-					}else if(cell.getCellType() == HSSFCell.CELL_TYPE_BOOLEAN){
-						dataRow.add(Boolean.valueOf(cell.getBooleanCellValue()));
-					}else if(cell.getCellType() == HSSFCell.CELL_TYPE_FORMULA){
-						dataRow.add(""+cell.getCellFormula());
-						//dataRow.add(cell.getNumericCellValue());
-					}else{
-						dataRow.add(cell.getStringCellValue());
-					}						
+					}else if(currCellType.compareTo(CellType.BOOLEAN) == 0){
+						dataRow.add(cell.getBooleanCellValue());
+					}else if(currCellType.compareTo(CellType.FORMULA) == 0
+							|| currCellType.compareTo(CellType.BLANK) == 0
+							|| currCellType.compareTo(CellType.ERROR) == 0){
+						dataRow.add("");
+					}				
 				}else{
 					dataRow.add("");
 				}
diff --git a/src/main/java/com/taover/util/UtilString.java b/src/main/java/com/taover/util/UtilString.java
index 7827a1f..007500c 100644
--- a/src/main/java/com/taover/util/UtilString.java
+++ b/src/main/java/com/taover/util/UtilString.java
@@ -6,6 +6,10 @@ import java.util.Date;
 import java.util.List;
 
 public class UtilString {
+	public static String trimCodePage(String data){
+		return data.replaceAll(new String(new byte[]{-30, -128, -83}), "");
+	}
+	
 	/**
 	 * 在compares字符数组查找pattern字符串，找到则返回字串在数组中的索引，未找到返回-1
 	 * @param pattern
--
libgit2 0.21.2