Merge branch 'master' of gitlab.taover.com:taov-erp/com-taover-util

gaoming
2 parents 9110a2b3 3c5622a3
Showing 6 changed files with 112 additions and 30 deletions Show diff stats
build.gradle
src/main/java/com/taover/util/BasicType.java
src/main/java/com/taover/util/ClassUtil.java
src/main/java/com/taover/util/UtilExcel.java
src/main/java/com/taover/util/UtilString.java
src/test/java/TempExcel.java
@@ -59,7 +59,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '1.1.98'
+                version '1.1.101'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
@@ -0,0 +1,43 @@
+package com.taover.util;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+public enum BasicType {
+	BYTE, SHORT, INT, INTEGER, LONG, DOUBLE, FLOAT, BOOLEAN, CHAR, CHARACTER, STRING;
+
+	public static final Map<Class<?>, Class<?>> wrapperPrimitiveMap = new ConcurrentHashMap<>(8);
+	public static final Map<Class<?>, Class<?>> primitiveWrapperMap = new ConcurrentHashMap<>(8);
+	
+	static {
+		wrapperPrimitiveMap.put(Boolean.class, boolean.class);
+		wrapperPrimitiveMap.put(Byte.class, byte.class);
+		wrapperPrimitiveMap.put(Character.class, char.class);
+		wrapperPrimitiveMap.put(Double.class, double.class);
+		wrapperPrimitiveMap.put(Float.class, float.class);
+		wrapperPrimitiveMap.put(Integer.class, int.class);
+		wrapperPrimitiveMap.put(Long.class, long.class);
+		wrapperPrimitiveMap.put(Short.class, short.class);
+
+		for (Map.Entry<Class<?>, Class<?>> entry : wrapperPrimitiveMap.entrySet()) {
+			primitiveWrapperMap.put(entry.getValue(), entry.getKey());
+		}
+	}
+	
+	public static Class<?> wrap(Class<?> clazz){
+		if(null == clazz || false == clazz.isPrimitive()){
+			return clazz;
+		}
+		Class<?> result = primitiveWrapperMap.get(clazz);
+		return (null == result) ? clazz : result;
+	}
+	
+	public static Class<?> unWrap(Class<?> clazz){
+		if(null == clazz || clazz.isPrimitive()){
+			return clazz;
+		}
+		Class<?> result = wrapperPrimitiveMap.get(clazz);
+		return (null == result) ? clazz : result;
+	}
+}
@@ -0,0 +1,22 @@
+package com.taover.util;
+
+/**
+ * 从HuTool那里COPY过来的
+ * @author Administrator
+ *
+ */
+public class ClassUtil {
+	public static boolean isPrimitiveWrapper(Class<?> clazz) {
+		if (null == clazz) {
+			return false;
+		}
+		return BasicType.wrapperPrimitiveMap.containsKey(clazz);
+	}
+
+	public static boolean isBasicType(Class<?> clazz) {
+		if (null == clazz) {
+			return false;
+		}
+		return (clazz.isPrimitive() || isPrimitiveWrapper(clazz));
+	}
+}
 \ No newline at end of file
@@ -10,7 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.Cell;
@@ -134,15 +133,7 @@ public class UtilExcel {
 				for(int j=0; j<dataRow.size(); ++j){
 					Cell cell = row.createCell(j);
 					Object dataCell = dataRow.get(j);
-					if(dataCell != null){
-						if(dataCell.getClass().isPrimitive()){
-							cell.setCellValue(Double.valueOf(dataCell.toString()));
-						}else if(dataCell.getClass().getSimpleName().equals("Date")){
-							cell.setCellValue((Date)dataCell);	
-						}else{
-							cell.setCellValue(dataCell.toString());
-						}	
-					}				
+					setCellValue(cell, dataCell);
 				}	
 			}			
 		}		
@@ -168,6 +159,17 @@ public class UtilExcel {
 		}		
 	}
+	private static void setCellValue(Cell cell, Object data) {
+		if(data != null){
+			if(ClassUtil.isBasicType(data.getClass())){
+				cell.setCellValue(Double.valueOf(data.toString()));
+			}else if(data.getClass().getSimpleName().equals("Date")){
+				cell.setCellValue((Date)data);	
+			}else{
+				cell.setCellValue(data.toString());
+			}	
+		}
+	}
 	/**
 	 * 创建并保存excel表 sheet
@@ -192,15 +194,7 @@ public class UtilExcel {
 					for(int k=0; k<dataRow.size(); ++k){
 						Cell cell = row.createCell(k);
 						Object dataCell = dataRow.get(k);
-						if(dataCell != null){
-							if(dataCell.getClass().isPrimitive()){
-								cell.setCellValue(Double.valueOf(dataCell.toString()));
-							}else if(dataCell.getClass().getSimpleName().equals("Date")){
-								cell.setCellValue((Date)dataCell);	
-							}else{
-								cell.setCellValue(dataCell.toString());
-							}	
-						}				
+						setCellValue(cell, dataCell);
 					}	
 				}			
 			}		
@@ -255,15 +249,7 @@ public class UtilExcel {
 				for(int j=0; j<dataRow.size(); ++j){
 					Cell cell = row.createCell(j);
 					Object dataCell = dataRow.get(j);					
-					if(dataCell != null){
-						if(dataCell.getClass().isPrimitive()){
-							cell.setCellValue(Double.valueOf(dataCell.toString()));
-						}else if(dataCell.getClass().getSimpleName().equals("Date")){
-							cell.setCellValue((Date)dataCell);	
-						}else{
-							cell.setCellValue(dataCell.toString());
-						}	
-					}
+					setCellValue(cell, dataCell);
 					if(backColor != null){
 						cell.setCellStyle(style);	
 					}
@@ -20,6 +20,8 @@ public class UtilString {
 			return "";
 		}
+		source = replaceCodePage(source, "");
+		source = replaceNoBreakBackspace(source, "");
 		Pattern pattern = Pattern.compile("\\S");
 		int startIndex = -1;
 		for(int i=0; i<source.length(); ++i){
@@ -44,6 +46,8 @@ public class UtilString {
 			return "";
 		}
+		source = replaceCodePage(source, "");
+		source = replaceNoBreakBackspace(source, "");
 		Pattern pattern = Pattern.compile("\\S");
 		int endIndex = source.length()-1;
 		for(int i=source.length()-1; i>=0; --i){
@@ -93,10 +97,19 @@ public class UtilString {
 		return "";
 	}
+	@Deprecated
 	public static String trimCodePage(String data){
 		return data.replaceAll(new String(new byte[]{-30, -128, -83}), "");
 	}
+	public static String replaceCodePage(String data, String replaceStr){
+		return data.replaceAll(new String(new byte[]{-30, -128, -83}), replaceStr);
+	}
+	
+	public static String replaceNoBreakBackspace(String data, String replaceStr) {
+		return data.replaceAll(new String(new byte[] {-62, -96}), replaceStr);
+	}
+	
 	/**
 	 * 在compares字符数组查找pattern字符串，找到则返回字串在数组中的索引，未找到返回-1
 	 * @param pattern
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -9,7 +11,23 @@ import com.taover.util.UtilExcel;
 public class TempExcel {
 	public static void main(String[] args){
-		checkExcelError();
+		//checkExcelError();
+		saveExcel();
+	}
+	
+	public static void saveExcel() {
+		List<List<Object>> data = new ArrayList<List<Object>>();
+		data.add(Collections.singletonList(123));
+		data.add(Collections.singletonList(123.222));
+		data.add(Collections.singletonList(1232223234234234L));
+		data.add(Collections.singletonList("123"));
+		data.add(Collections.singletonList("1232223234234234"));
+		data.add(Collections.singletonList(new Date()));
+		try {
+			UtilExcel.saveExcel("data", data, "C:\\Users\\Administrator\\Desktop\\1234.xlsx");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 	public static void checkExcelError() {
	@@ -59,7 +59,7 @@ uploadArchives {		@@ -59,7 +59,7 @@ uploadArchives {
59	authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)	59	authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
60	}	60	}
61	pom.project {	61	pom.project {
62	- version '1.1.98'	62	+ version '1.1.101'
63	artifactId ARTIFACT_Id	63	artifactId ARTIFACT_Id
64	groupId GROUP_ID	64	groupId GROUP_ID
65	packaging TYPE	65	packaging TYPE
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+package com.taover.util;
	2	+
	3	+import java.util.Map;
	4	+import java.util.concurrent.ConcurrentHashMap;
	5	+
	6	+
	7	+public enum BasicType {
	8	+ BYTE, SHORT, INT, INTEGER, LONG, DOUBLE, FLOAT, BOOLEAN, CHAR, CHARACTER, STRING;
	9	+
	10	+ public static final Map<Class<?>, Class<?>> wrapperPrimitiveMap = new ConcurrentHashMap<>(8);
	11	+ public static final Map<Class<?>, Class<?>> primitiveWrapperMap = new ConcurrentHashMap<>(8);
	12	+
	13	+ static {
	14	+ wrapperPrimitiveMap.put(Boolean.class, boolean.class);
	15	+ wrapperPrimitiveMap.put(Byte.class, byte.class);
	16	+ wrapperPrimitiveMap.put(Character.class, char.class);
	17	+ wrapperPrimitiveMap.put(Double.class, double.class);
	18	+ wrapperPrimitiveMap.put(Float.class, float.class);
	19	+ wrapperPrimitiveMap.put(Integer.class, int.class);
	20	+ wrapperPrimitiveMap.put(Long.class, long.class);
	21	+ wrapperPrimitiveMap.put(Short.class, short.class);
	22	+
	23	+ for (Map.Entry<Class<?>, Class<?>> entry : wrapperPrimitiveMap.entrySet()) {
	24	+ primitiveWrapperMap.put(entry.getValue(), entry.getKey());
	25	+ }
	26	+ }
	27	+
	28	+ public static Class<?> wrap(Class<?> clazz){
	29	+ if(null == clazz \|\| false == clazz.isPrimitive()){
	30	+ return clazz;
	31	+ }
	32	+ Class<?> result = primitiveWrapperMap.get(clazz);
	33	+ return (null == result) ? clazz : result;
	34	+ }
	35	+
	36	+ public static Class<?> unWrap(Class<?> clazz){
	37	+ if(null == clazz \|\| clazz.isPrimitive()){
	38	+ return clazz;
	39	+ }
	40	+ Class<?> result = wrapperPrimitiveMap.get(clazz);
	41	+ return (null == result) ? clazz : result;
	42	+ }
	43	+}
	@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
		1	+package com.taover.util;
		2	+
		3	+/**
		4	+ * 从HuTool那里COPY过来的
		5	+ * @author Administrator
		6	+ *
		7	+ */
		8	+public class ClassUtil {
		9	+ public static boolean isPrimitiveWrapper(Class<?> clazz) {
		10	+ if (null == clazz) {
		11	+ return false;
		12	+ }
		13	+ return BasicType.wrapperPrimitiveMap.containsKey(clazz);
		14	+ }
		15	+
		16	+ public static boolean isBasicType(Class<?> clazz) {
		17	+ if (null == clazz) {
		18	+ return false;
		19	+ }
		20	+ return (clazz.isPrimitive() \|\| isPrimitiveWrapper(clazz));
		21	+ }
		22	+}
0	\ No newline at end of file	23	\ No newline at end of file
1	import java.io.File;	1	import java.io.File;
2	import java.util.ArrayList;	2	import java.util.ArrayList;
		3	+import java.util.Collections;
		4	+import java.util.Date;
3	import java.util.HashMap;	5	import java.util.HashMap;
4	import java.util.Iterator;	6	import java.util.Iterator;
5	import java.util.List;	7	import java.util.List;
	@@ -9,7 +11,23 @@ import com.taover.util.UtilExcel;		@@ -9,7 +11,23 @@ import com.taover.util.UtilExcel;
9		11
10	public class TempExcel {	12	public class TempExcel {
11	public static void main(String[] args){	13	public static void main(String[] args){
12	- checkExcelError();	14	+ //checkExcelError();
		15	+ saveExcel();
		16	+ }
		17	+
		18	+ public static void saveExcel() {
		19	+ List<List<Object>> data = new ArrayList<List<Object>>();
		20	+ data.add(Collections.singletonList(123));
		21	+ data.add(Collections.singletonList(123.222));
		22	+ data.add(Collections.singletonList(1232223234234234L));
		23	+ data.add(Collections.singletonList("123"));
		24	+ data.add(Collections.singletonList("1232223234234234"));
		25	+ data.add(Collections.singletonList(new Date()));
		26	+ try {
		27	+ UtilExcel.saveExcel("data", data, "C:\\Users\\Administrator\\Desktop\\1234.xlsx");
		28	+ } catch (Exception e) {
		29	+ e.printStackTrace();
		30	+ }
13	}	31	}
14		32
15	public static void checkExcelError() {	33	public static void checkExcelError() {