改善代码实现逻辑

pom.xml

@@ -5,9 +5,34 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.lxyer</groupId>
-    <artifactId>jdk-demo</artifactId>
+    <artifactId>excel</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.1.0</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <!-- poi支持 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <build>
+        <finalName>JExcel</finalName>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>test</testSourceDirectory>
         <resources>
@@ -26,37 +51,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.redkale</groupId>
-            <artifactId>redkale</artifactId>
-            <version>1.9.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>6.0.37</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
 </project>

src/com/lxyer/excel/poi/ExcelKit.java

@@ -5,17 +5,29 @@ import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
+	下载示例
+	private static boolean downloadExcel(Workbook wb, String xlsName, HttpServletRequest request, HttpServletResponse response) throws IOException{
+			if(request.getHeader("user-agent").indexOf("MSIE") != -1) {
+				xlsName = java.net.URLEncoder.encode(xlsName,"utf-8") + ".xls";
+			} else {
+			    xlsName = new String(xlsName.getBytes("utf-8"),"iso-8859-1")+ ".xls";
+			}
+			OutputStream os = response.getOutputStream();
+			response.setContentType("application/vnd.ms-excel");
+			response.setHeader("Content-disposition", "attachment;filename="+xlsName);
+
+			wb.write(os);
+			return true;
+	}
+
  * 使用poi报表导出工具类
  * 把poi的一个调用接口抽出来，便于导出功能的管理
  * @author LiangXianYou lxy208@126.com
@@ -24,45 +36,14 @@ import java.util.*;
  */
 public class ExcelKit {
 
-	/**
-	 * <b>导出list中map做载体的数据到excel</b><br>
-	 * 参数说明：<br>
-	 * 	list:存放了Map数据的集合<br>
-	 * 	hdNames:表头列名<br>
-	 * 	hds:对应表头的数据KEY<br>
-	 *  xlsName:导出文件名<br>
-	 * @author LiangXianYou
-	 * @date 2015-6-25 上午10:22:51
-	 */
-	public static <T> boolean exportByMap(List<Map<String, Object>> list, String[] hdNames, String[] hds, String xlsName, HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
-		Workbook wb = new XSSFWorkbook();			//创建工作薄
-		Sheet sheet = wb.createSheet();				//创建工作表
-		sheet.autoSizeColumn(( short ) 0 );			//自适应宽度
-		//写入表头---Excel的第一行数据
-		Row nRow = sheet.createRow(0);				//创建行
-		for(int i=0;i<hdNames.length;i++){
-			Cell nCell = nRow.createCell(i);			//创建单元格
-			nCell.setCellValue(hdNames[i]);
-		}  
-		
-		//写入每一行数据---一条记录就是一行数据
-		for(int i=0;i<list.size();i++){
-			for(int j=0;j<hds.length;j++){
-				Object o = list.get(i).get(hds[j]);		//得到列的值
-				data2Excel(sheet, o, i+1, j);			//将值写入Excel
-			}
-		}
-		return downloadExcel(wb, xlsName, request, response);
-	}
-
     /**
      * Excels导出多个sheet
+     *
      * @author LiangXianYou
      * @date 2015-6-16 下午5:56:56
      */
-	//map:data,sheetName,hds,hdNames,xlsName;request,response
+    //map:data,sheetName,hds,hdNames,xlsName;
-	public static <T> boolean exportExcels(List<Map<String, Object>> list,String xlsName, HttpServletRequest request, HttpServletResponse response) throws Exception{
+    public static <T> Workbook exportExcels(List<Map<String, Object>> list) throws Exception {
 
         Workbook wb = new XSSFWorkbook();            //创建工作薄
         for (int i = 0; i < list.size(); i++) {
@@ -90,7 +71,7 @@ public class ExcelKit {
             }
         }
 
-		return downloadExcel(wb, xlsName, request, response);
+        return wb;
     }
 
     /**
@@ -102,11 +83,12 @@ public class ExcelKit {
      * request:	HttpServletRequest
      * response：HttpServletResponse
      * 通过数据构建Excel
-	 * @author LiangXianYou
+     *
      * @throws Exception
+     * @author LiangXianYou
      * @date 2015-3-13 上午11:00:30
      */
-	public static <T> boolean exportExcel(List<T> list, String[] hdNames, String[] hds, String xlsName, HttpServletRequest request, HttpServletResponse response) throws Exception{
+    public static <T> Workbook exportExcel(List<T> list, String[] hdNames, String[] hds) throws Exception {
 
         Workbook wb = new XSSFWorkbook();            //创建工作薄
         Sheet sheet = wb.createSheet();                //创建工作表
@@ -125,46 +107,35 @@ public class ExcelKit {
                 data2Excel(sheet, o, i + 1, j); //将值写入Excel
             }
         }
-		return downloadExcel(wb, xlsName, request, response);
+        return wb;
     }
 
-	/**
-	 * 传递一个Wookbook，给定文件名，以及request和response下载Excel文档 
-	 * @author LiangXianYou
-	 * @throws IOException
-	 * @date 2015-3-13 上午9:00:36
-	 */
-	private static boolean downloadExcel(Workbook wb, String xlsName, HttpServletRequest request, HttpServletResponse response) throws IOException{
-			if(request.getHeader("user-agent").indexOf("MSIE") != -1) {   
-				xlsName = java.net.URLEncoder.encode(xlsName,"utf-8") + ".xls"; 
-			} else {
-			    xlsName = new String(xlsName.getBytes("utf-8"),"iso-8859-1")+ ".xls";   
-			}
-			OutputStream os = response.getOutputStream();
-			response.setContentType("application/vnd.ms-excel");
-			response.setHeader("Content-disposition", "attachment;filename="+xlsName);    
-			
-			wb.write(os);
-			return true;
-	}
 
     /**
      * 通过泛型实例对象得到某一字段值
+     *
      * @author LiangXianYou
      * @date 2015-3-13 上午10:53:32
      */
     private static <T> Object getFieldValue(T t, String fieldName) throws Exception {
+        Object v;
+
         if (t == null) {
-			return null;
+            v = null;
-		}
+        } else if (t instanceof Map) {
+            v = ((Map) t).get(fieldName); //得到列的值
+        } else {
             Field field = t.getClass().getDeclaredField(fieldName);
             field.setAccessible(true); //暴力反射
-		Object o = field.get(t);//得到字段数据的值
+            v = field.get(t); //得到字段数据的值
-		return o;
+        }
+
+        return v;
     }
 
     /**
      * 将数据写到Excel中
+     *
      * @author LiangXianYou
      * @date 2015-3-13 上午10:37:55
      */
@@ -195,6 +166,7 @@ public class ExcelKit {
         List<Map> list = readExcel(file, fields, 1, null);
         return list.size() > 0 ? list.get(0) : new HashMap();
     }
+
     //read excel head by sheetName
     public static Map readExcelHead(File file, String[] fields, String sheetName) throws IOException {
         List<Map> list = readExcel(file, fields, 1, sheetName);
@@ -233,20 +205,20 @@ public class ExcelKit {
 
     //read excel sheet[0]
     private static List<Map> readExcel(File file, String[] fields, int lastRowNum, String sheetName) throws IOException {
-		Workbook wk;
+        Workbook wk = getWorkbook(file);
-		try {
-			wk = new HSSFWorkbook(new FileInputStream(file));//if excel version 2007+ will throws OfficeXmlFileException
-		}catch (OfficeXmlFileException e){
-			wk = new XSSFWorkbook(new FileInputStream(file));
-		}
         Sheet sheet = sheetName == null ? wk.getSheetAt(0) : wk.getSheet(sheetName);
-		if (sheet == null) throw new OfficeXmlFileException("sheet["+sheetName+"] can't find");
+        if (sheet == null) throw new OfficeXmlFileException("sheet[" + sheetName + "] can't findList");
+
+        if (lastRowNum < 0 || lastRowNum > sheet.getLastRowNum()) {
+            lastRowNum = sheet.getLastRowNum();
+        }
         return readExcel(sheet, fields, lastRowNum);
     }
 
     /**
      * read excel all sheet,
      * can read excel 2007+ and 2007-
+     *
      * @param file
      * @param fields
      * @param lastRowNum
@@ -254,12 +226,7 @@ public class ExcelKit {
      * @throws IOException
      */
     private static Map<String, List<Map>> readExcelAll(File file, String[] fields, int lastRowNum) throws IOException {
-		Workbook wk;
+        Workbook wk = getWorkbook(file);
-		try {
-			wk = new HSSFWorkbook(new FileInputStream(file));//if excel version 2007+ will throws OfficeXmlFileException
-		}catch (OfficeXmlFileException e){
-			wk = new XSSFWorkbook(new FileInputStream(file));
-		}
 
         Map<String, List<Map>> data = new LinkedHashMap<>();
         //reading all sheet
@@ -278,20 +245,22 @@ public class ExcelKit {
 
     /**
      * read excel
+     *
      * @author Lxyer 2016/8/1 10:32.
      */
     private static List<Map> readExcel(Sheet sheet, String[] fields, int lastRowNum) throws OfficeXmlFileException {
+        if (lastRowNum < 0 || lastRowNum > sheet.getLastRowNum()) {
+            lastRowNum = sheet.getLastRowNum();
+        }
+
         if (fields == null || fields.length == 0) {
             return readExcel(sheet, lastRowNum);
         }
 
         List<Map> list = new ArrayList<>();
-		if (lastRowNum < 0 || lastRowNum > sheet.getLastRowNum()){
-			lastRowNum = sheet.getLastRowNum();
-		}
-
         int t = 0;
-		r:for (int i=0; i<=lastRowNum; i++){
+        r:
+        for (int i = 0; i <= lastRowNum; i++) {
             Row row = sheet.getRow(i);
             if (row == null) continue;
             short cellNum = row.getLastCellNum();
@@ -321,7 +290,6 @@ public class ExcelKit {
     }
 
     /**
-	 *
      * @author Lxyer 2016/9/21 00:38.
      */
     private static List<Map> readExcel(Sheet sheet, int lastRowNum) throws OfficeXmlFileException {
@@ -331,7 +299,8 @@ public class ExcelKit {
         }
 
         int t = 0;
-		r:for (int i=0; i<=lastRowNum; i++){
+        r:
+        for (int i = 0; i <= lastRowNum; i++) {
             Row row = sheet.getRow(i);
             if (row == null) continue;
             short cellNum = row.getLastCellNum();
@@ -379,13 +348,7 @@ public class ExcelKit {
 
     //get all sheet names
     public static List<String> getSheetNames(File file) throws IOException {
-		Workbook wk;
+        Workbook wk = getWorkbook(file);
-		try {
-			wk = new HSSFWorkbook(new FileInputStream(file));//if excel version 2007+ will throws OfficeXmlFileException
-		}catch (OfficeXmlFileException e){
-			wk = new XSSFWorkbook(new FileInputStream(file));
-		}
-
         List<String> sheetNames = new ArrayList<>();
         for (int i = 0; i < wk.getNumberOfSheets(); i++) {
             sheetNames.add(wk.getSheetAt(i).getSheetName());
@@ -393,4 +356,15 @@ public class ExcelKit {
         return sheetNames;
     }
 
+    private static Workbook getWorkbook(File file) throws IOException {
+        Workbook wk;
+        try {
+            wk = new HSSFWorkbook(new FileInputStream(file));//if excel version 2007+ will throws OfficeXmlFileException
+        } catch (OfficeXmlFileException e) {
+            wk = new XSSFWorkbook(new FileInputStream(file));
+        }
+
+        return wk;
+    }
+
 }

test/com/lxyer/excel/ExcelKitTest.java

@@ -14,7 +14,7 @@ import java.util.Map;
 public class ExcelKitTest {
 
     //read excel by fields
-    @Test
+    //@Test
     public void readTest() throws IOException {
         /*String sql1 = "select a, b, c from Sheet1";
         String sql2 = "select a, b, c from Sheet1 where a=1 order by b";
@@ -33,7 +33,7 @@ public class ExcelKitTest {
     }
 
     //read excel no fields
-    @Test
+    //@Test
     public void readTest2() throws IOException {
         List<Map> list = ExcelKit.readExcel(new File("res/test.xlsx"));
 

test/com/lxyer/excel/ExportKitTest.java

@@ -1,13 +1,10 @@
 package com.lxyer.excel;
 
-import org.junit.Test;
+import java.io.BufferedOutputStream;
-import org.redkale.net.http.HttpResponse;
+import java.io.File;
-
+import java.io.FileOutputStream;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
 import java.util.*;
-import java.util.concurrent.CountDownLatch;
 import java.util.function.BiFunction;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -25,7 +22,7 @@ import java.util.zip.ZipOutputStream;
 public class ExportKitTest {
 
     //1、导出List<javabean>示例
-    @Test
+    //@Test
     public void exportBean(){
         Map<String, String> heads = new LinkedHashMap();
         heads.put("姓名", "name");
@@ -52,7 +49,7 @@ public class ExportKitTest {
     }
 
     //2、导出List<Map> 示例
-    @Test
+    //@Test
     public void exportMapToZip(){
 
         Map<String, String> heads = new LinkedHashMap();
@@ -101,6 +98,7 @@ public class ExportKitTest {
      * @return
      * @throws IOException
      */
+    /*
     public <T> boolean exportExcel(Map head, List<T> rows, HttpServletRequest request, HttpServletResponse response, String xlsName, BiFunction fun) throws IOException {
         if(request.getHeader("user-agent") != null && request.getHeader("user-agent").indexOf("MSIE") != -1) {
             xlsName = java.net.URLEncoder.encode(xlsName,"utf-8") + ".xls";
@@ -120,6 +118,7 @@ public class ExportKitTest {
         os.write(ExcelExportKit.exportExcel(head, rows, fun).toString().getBytes());
         return true;
     }
+    */
 
     /**
      * 4、导出压缩的excel示例
@@ -156,6 +155,7 @@ public class ExportKitTest {
      * @return
      * @throws IOException
      */
+    /*
     public static <T,U,R> void exportExcel(Map head, List<T> rows, HttpResponse response, String xlsName, BiFunction<T,U,R> fun) throws IOException {
 
         xlsName = new String(xlsName.getBytes("utf-8"),"iso-8859-1")+ ".xls";
@@ -165,4 +165,5 @@ public class ExportKitTest {
         StringBuilder buf = ExcelExportKit.exportExcel(head, rows, fun);
         response.finish(buf.toString().getBytes());
     }
+    */
 }