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

王彬
2 parents 91e42cfa b88e024c
Showing 1 changed file with 9 additions and 2 deletions Show diff stats
src/main/java/com/taover/util/UtilExcel.java
@@ -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);