.

gaoming
1 parent 33a3ecf6
Showing 2 changed files with 10 additions and 3 deletions Show diff stats
build.gradle
src/main/java/com/taover/util/UtilExcel.java
@@ -54,7 +54,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '1.1.20'
+                version '1.1.21'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
@@ -23,6 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 public class UtilExcel {
 	private final static String excel2003L =".xls";    //2003- 版本的excel  
     private final static String excel2007U =".xlsx";   //2007+ 版本的excel
+    private final static String CSV =".csv";   //csv
  
     private final static int maxExcelRowNum = 5000;
     private final static int maxExcelColumnNum = 50;
@@ -54,7 +55,13 @@ public class UtilExcel {
         	}else{
         		wb = new XSSFWorkbook();  //2007+	
         	}              
-        }else{  
+        }else if(CSV.equals(fileType.trim().toLowerCase())){
+        	if(isRead){        		
+        		wb = new HSSFWorkbook(new FileInputStream(filePath));  //2003-
+        	}else{
+        		wb = new HSSFWorkbook();  //2003-	
+        	}
+        } else{  
             throw new Exception("解析的文件格式有误！");  
         }  
         return wb;  
@@ -387,7 +394,7 @@ public class UtilExcel {
  
 	public static void main(String args[]){
 		//String filepath = "C:\\Users\\root\\Desktop\\千丁-6.27.xlsx";
-		String filepath = "C:\\Users\\EDZ\\Desktop\\gaoming测试甩单.xls";
+		String filepath = "C:\\Users\\EDZ\\Desktop\\gaoming测试甩单.csv";
 		List<List<Object>> data = null;
 		try {
 			data = UtilExcel.readExcel(filepath);
...	...	@@ -54,7 +54,7 @@ uploadArchives {
54	54	authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
55	55	}
56	56	pom.project {
57		- version '1.1.20'
	57	+ version '1.1.21'
58	58	artifactId ARTIFACT_Id
59	59	groupId GROUP_ID
60	60	packaging TYPE
...	...
...	...	@@ -23,6 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
23	23	public class UtilExcel {
24	24	private final static String excel2003L =".xls"; //2003- 版本的excel
25	25	private final static String excel2007U =".xlsx"; //2007+ 版本的excel
	26	+ private final static String CSV =".csv"; //csv
26	27
27	28	private final static int maxExcelRowNum = 5000;
28	29	private final static int maxExcelColumnNum = 50;
...	...	@@ -54,7 +55,13 @@ public class UtilExcel {
54	55	}else{
55	56	wb = new XSSFWorkbook(); //2007+
56	57	}
57		- }else{
	58	+ }else if(CSV.equals(fileType.trim().toLowerCase())){
	59	+ if(isRead){
	60	+ wb = new HSSFWorkbook(new FileInputStream(filePath)); //2003-
	61	+ }else{
	62	+ wb = new HSSFWorkbook(); //2003-
	63	+ }
	64	+ } else{
58	65	throw new Exception("解析的文件格式有误！");
59	66	}
60	67	return wb;
...	...	@@ -387,7 +394,7 @@ public class UtilExcel {
387	394
388	395	public static void main(String args[]){
389	396	//String filepath = "C:\\Users\\root\\Desktop\\千丁-6.27.xlsx";
390		- String filepath = "C:\\Users\\EDZ\\Desktop\\gaoming测试甩单.xls";
	397	+ String filepath = "C:\\Users\\EDZ\\Desktop\\gaoming测试甩单.csv";
391	398	List<List<Object>> data = null;
392	399	try {
393	400	data = UtilExcel.readExcel(filepath);
...	...