From f78fc6a6b62703ff58a23e80d29cba35f41b8592 Mon Sep 17 00:00:00 2001
From: unknown <wangbin@taover.com>
Date: Tue, 16 Jun 2020 15:48:53 +0800
Subject: [PATCH] 1.提交Excel文件生成代码优化

---
 build.gradle                                 |  2 +-
 src/main/java/com/taover/util/BasicType.java | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/main/java/com/taover/util/ClassUtil.java | 22 ++++++++++++++++++++++
 src/main/java/com/taover/util/UtilExcel.java | 41 ++++++++++++++---------------------------
 src/test/java/TempExcel.java                 | 20 +++++++++++++++++++-
 5 files changed, 99 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/com/taover/util/BasicType.java
 create mode 100644 src/main/java/com/taover/util/ClassUtil.java

diff --git a/build.gradle b/build.gradle
index ab5d4ec..f7d1a06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '1.1.96'
+                version '1.1.99'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
diff --git a/src/main/java/com/taover/util/BasicType.java b/src/main/java/com/taover/util/BasicType.java
new file mode 100644
index 0000000..e545fd3
--- /dev/null
+++ b/src/main/java/com/taover/util/BasicType.java
@@ -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;
+	}
+}
diff --git a/src/main/java/com/taover/util/ClassUtil.java b/src/main/java/com/taover/util/ClassUtil.java
new file mode 100644
index 0000000..f33eb6c
--- /dev/null
+++ b/src/main/java/com/taover/util/ClassUtil.java
@@ -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
diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java
index 6e2232d..fce07c1 100644
--- a/src/main/java/com/taover/util/UtilExcel.java
+++ b/src/main/java/com/taover/util/UtilExcel.java
@@ -133,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);
 				}	
 			}			
 		}		
@@ -167,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
@@ -191,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);
 					}	
 				}			
 			}		
@@ -254,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);	
 					}
diff --git a/src/test/java/TempExcel.java b/src/test/java/TempExcel.java
index 09635b0..1fde7ad 100644
--- a/src/test/java/TempExcel.java
+++ b/src/test/java/TempExcel.java
@@ -1,5 +1,7 @@
 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() {
--
libgit2 0.21.2