.

pom.xml

@@ -13,24 +13,14 @@
         <dependency>
             <groupId>org.redkale</groupId>
             <artifactId>redkale</artifactId>
-            <version>1.9.9</version>
+            <version>2.0.0.alpha1</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.17</version>
-        </dependency>
+        <!-- poi支持 -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <!-- excel操作支持 -->
-        <dependency>
-            <groupId>com.lxyer</groupId>
-            <artifactId>excel</artifactId>
-            <version>0.1.0</version>
+            <version>4.1.0</version>
         </dependency>
 
         <dependency>
@@ -38,12 +28,6 @@
             <artifactId>gson</artifactId>
             <version>2.8.4</version>
         </dependency>
-        <!--<dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>7.0.47</version>
-            <scope>compile</scope>
-        </dependency>-->
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>enjoy</artifactId>

src/com/eversec/common/ExcelKit.java

@@ -0,0 +1,408 @@
+package com.eversec.common;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
+import org.apache.poi.ss.formula.functions.T;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+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
+ * @param
+ *
+ */
+public class ExcelKit {
+
+    /**
+     * Excels导出多个sheet
+     *
+     * @author LiangXianYou
+     * @date 2015-6-16 下午5:56:56
+     */
+    //map:data,sheetName,hds,hdNames,
+    public static <T> Workbook exportExcels(List<Map<String, Object>> list) throws Exception {
+
+        Workbook wb = new XSSFWorkbook();
+        for (int i = 0; i < list.size(); i++) {
+            Map<String, Object> map = list.get(i);
+            Sheet sheet = wb.createSheet();
+            String sheetName = (String) map.get("sheetName");
+            wb.setSheetName(i, sheetName);
+            //写入表头---Excel的第一行数据
+            Row nRow = sheet.createRow(0);
+            String[] hdNames = (String[]) map.get("hdNames");
+            for (int j = 0; j < hdNames.length; j++) {
+                Cell nCell = nRow.createCell(j);
+                nCell.setCellValue(hdNames[j]);
+            }
+
+            //写入每一行数据---一条记录就是一行数据
+            @SuppressWarnings("unchecked")
+            List<T> data = (List<T>) map.get("data");
+            String[] hds = (String[]) map.get("hds");
+            dataToSheet(sheet, data, hds, 1);
+        }
+
+        return wb;
+    }
+
+    /**
+     * 参数说明：
+     * list：list数据集合
+     * headMap：每一列的字段名和对应的表头名称 如：{name:"姓名"， age:"年龄"}
+     * 通过数据构建 Workbook 对象
+     *
+     * @throws Exception
+     * @author LiangXianYou
+     * @date 2015-3-13 上午11:00:30
+     */
+    public static Workbook exportExcel(List<T> list, LinkedHashMap<String, String> headMap) throws Exception {
+        String[] hdNames = new String[headMap.size()]; //
+        String[] hds = new String[headMap.size()];
+
+        int[] tag = {0};
+        headMap.forEach((k,v) -> {
+            hds[tag[0]] = k;
+            hdNames[tag[0]] = v;
+            tag[0] ++;
+        });
+
+        return exportExcel(list, hdNames, hds);
+    }
+
+    /**
+     * 使用数据构建 excel 工作薄对象
+     * @param list    数据
+     * @param hdNames 表头
+     * @param hds     每条记录中数据的属性名
+     * @param <T>     数据泛型，支持javaBean 或Map
+     * @return
+     * @throws Exception
+     * @author LiangXianYou
+     * @date 2015-3-13 上午11:00:30
+     */
+    public static <T> Workbook exportExcel(List<T> list, String[] hdNames, String[] hds) throws Exception {
+
+        Workbook wb = new XSSFWorkbook();
+        Sheet sheet = wb.createSheet();
+        //写入表头---Excel的第一行数据
+        Row nRow = sheet.createRow(0);
+        for (int i = 0; i < hdNames.length; i++) {
+            Cell nCell = nRow.createCell(i);
+            nCell.setCellValue(hdNames[i]);
+        }
+
+        dataToSheet(sheet, list, hds, 1);
+        return wb;
+    }
+
+
+    /**
+     * 通过泛型实例对象得到某一字段值
+     *
+     * @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) {
+            v = null;
+        } else if (t instanceof Map) {
+            v = ((Map) t).get(fieldName);
+        } else {
+            Field field = t.getClass().getDeclaredField(fieldName);
+            field.setAccessible(true);
+            v = field.get(t);
+        }
+
+        return v;
+    }
+
+    /**
+     * 将数据写到Excel中
+     *
+     * @author LiangXianYou
+     * @date 2015-3-13 上午10:37:55
+     */
+    private static <T> void dataToSheet(Sheet sheet, List<T> list, String[] hds, int skipRow) {
+        if (list == null || list.size() == 0) return;
+
+        for (int j = 0; j < list.size(); j++) {
+            for (int k = 0; k < hds.length; k++) {
+                Row nRow = sheet.getRow(j + skipRow);
+                if (nRow == null) {
+                    nRow = sheet.createRow(j + 1);
+                }
+                Cell cell = nRow.createCell(k);
+
+                try {
+                    Object v = getFieldValue(list.get(j), hds[k]);
+                    dataToCell(cell, v);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private static void dataToCell(Cell cell, Object v) {
+        //根据不同类型进行转化，如有其它类型没有考虑周全的，使用发现的时候添加
+        if (v instanceof Integer) cell.setCellValue((Integer) v);
+        else if (v instanceof Double) cell.setCellValue((Double) v);
+        else if (v instanceof Float) cell.setCellValue((Float) v);
+        else if (v instanceof String) cell.setCellValue((String) v);
+        else if (v instanceof Date) cell.setCellValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(v));
+        else if (v instanceof Calendar) cell.setCellValue((Calendar) v);
+        else if (v instanceof Boolean) cell.setCellValue((Boolean) v);
+        else if (v == null) cell.setCellValue("");
+        else cell.setCellValue(v + "");
+    }
+
+    //======================= 读取excel ===============================
+
+    //read excel head
+    public static Map readExcelHead(File file, String[] fields) throws IOException {
+        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);
+        return list.size() > 0 ? list.get(0) : new HashMap();
+    }
+
+    //read excel sheet[0]
+    public static List<Map> readExcel(File file, String[] fields) throws IOException {
+        return readExcel(file, fields, -1, null);
+    }
+
+    //read excel sheet[0] no fields
+    public static List<Map> readExcel(File file) throws IOException {
+        return readExcel(file, null, -1, null);
+    }
+
+    //read excel by sheetName
+    public static List<Map> readExcel(File file, String[] fields, String sheetName) throws IOException {
+        return readExcel(file, fields, -1, sheetName);
+    }
+
+    //read excel by sheetName no fields
+    public static List<Map> readExcel(File file, String sheetName) throws IOException {
+        return readExcel(file, null, -1, sheetName);
+    }
+
+    //read excel all sheet
+    public static Map<String, List<Map>> readExcelAll(File file, String[] fields) throws IOException {
+        return readExcelAll(file, fields, -1);
+    }
+
+    //read all excel no fields
+    public static Map<String, List<Map>> readExcelAll(File file) throws IOException {
+        return readExcelAll(file, null, -1);
+    }
+
+    //read excel sheet[0]
+    private static List<Map> readExcel(File file, String[] fields, int lastRowNum, String sheetName) throws IOException {
+        Workbook wk = getWorkbook(file);
+        Sheet sheet = sheetName == null ? wk.getSheetAt(0) : wk.getSheet(sheetName);
+        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
+     * @return
+     * @throws IOException
+     */
+    private static Map<String, List<Map>> readExcelAll(File file, String[] fields, int lastRowNum) throws IOException {
+        Workbook wk = getWorkbook(file);
+
+        Map<String, List<Map>> data = new LinkedHashMap<>();
+        //reading all sheet
+        for (int i = 0; i < wk.getNumberOfSheets(); i++) {
+            Sheet sheet = wk.getSheetAt(i);
+            List<Map> maps = readExcel(sheet, fields, lastRowNum);
+
+            //move head
+            /*if (lastRowNum < 0 && maps.size() > 0) {
+                maps.remove(0);
+            }*/
+            data.put(sheet.getSheetName(), maps);
+        }
+        return data;
+    }
+
+    /**
+     * 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<>();
+        int t = 0;
+        r:
+        for (int i = 0; i <= lastRowNum; i++) {
+            Row row = sheet.getRow(i);
+            if (row == null) continue;
+            short cellNum = row.getLastCellNum();
+            //空跳过/连续三行为空结束
+            if (isEmptyRow(row, fields.length)) {
+                if (t++ > 3) break;
+                continue;
+            }
+
+            Map map = new HashMap();
+            for (int j = 0; j < cellNum && j < fields.length; j++) {
+                Cell cell = row.getCell(j);
+                if (cell == null) {
+                    map.put(fields[j], "");
+                    continue;
+                }
+
+                if (cell.getCellType() == CellType.NUMERIC) {
+                    map.put(fields[j], (long) cell.getNumericCellValue() + "");
+                } else {
+                    map.put(fields[j], cell.getStringCellValue());
+                }
+            }
+            list.add(map);
+        }
+        return list;
+    }
+
+    /**
+     * @author Lxyer 2016/9/21 00:38.
+     */
+    private static List<Map> readExcel(Sheet sheet, int lastRowNum) throws OfficeXmlFileException {
+        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++) {
+            Row row = sheet.getRow(i);
+            if (row == null) continue;
+            short cellNum = row.getLastCellNum();
+            //空跳过/连续三行为空结束
+            if (isEmptyRow(row, 3)) {
+                if (t++ > 3) break;
+                continue;
+            }
+
+            Map map = new HashMap();
+            for (int j = 0; j < cellNum; j++) {
+                String field = (char) ((j / 26 == 0 ? ' ' : 'a') + j / 26) + "" + (char) ('a' + j % 26);
+                field = field.replace(" ", "");
+                Cell cell = row.getCell(j);
+                if (cell == null) {
+                    map.put(field, "");
+                    continue;
+                }
+
+                if (cell.getCellType() == CellType.NUMERIC) {
+                    map.put(field, (long) cell.getNumericCellValue() + "");
+                } else {
+                    map.put(field, cell.getStringCellValue());
+                }
+            }
+            list.add(map);
+        }
+        return list;
+    }
+
+    //空跳过/连续三行为空结束
+    private static boolean isEmptyRow(Row row, int len) {
+        for (int i = 0; i < row.getLastCellNum() && i < len; i++) {
+            Cell cell = row.getCell(i);//列
+            if (cell != null) {
+                if (cell.getCellType() != CellType.NUMERIC && cell.getStringCellValue() != null && !cell.getStringCellValue().isEmpty()) {
+                    return false;
+                } else if (cell.getCellType() == CellType.NUMERIC && cell.getNumericCellValue() != 0) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    //get all sheet names
+    public static List<String> getSheetNames(File file) throws IOException {
+        Workbook wk = getWorkbook(file);
+        List<String> sheetNames = new ArrayList<>();
+        for (int i = 0; i < wk.getNumberOfSheets(); i++) {
+            sheetNames.add(wk.getSheetAt(i).getSheetName());
+        }
+        return sheetNames;
+    }
+
+    private static Workbook getWorkbook(File file) throws IOException {
+        Workbook wk;
+        FileInputStream fis = new FileInputStream(file);
+        try {
+            wk = new HSSFWorkbook(fis);//if excel version 2007+ will throws OfficeXmlFileException
+        } catch (OfficeXmlFileException e) {
+            wk = new XSSFWorkbook(fis);
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (Exception e) {
+                    //e.printStackTrace();
+                }
+            }
+        }
+
+        return wk;
+    }
+
+    //dev
+    public void setWorkbook(File file) {
+
+    }
+
+}

src/com/eversec/dynamic/DnyController.java

@@ -1,11 +1,9 @@
 package com.eversec.dynamic;
 
 import com.eversec.common.JBean;
-import com.eversec.common.PageBean;
 import com.eversec.dynamic.entity.DnyAttr;
 import com.eversec.dynamic.entity.DnyCate;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -20,7 +18,7 @@ public class DnyController {
      * 保存表数据
      * @param request
      */
-    public String save(HttpServletRequest request, DnyCate dnyCate){
+    /*public String save(HttpServletRequest request, DnyCate dnyCate){
         //deal Attr
         dnyCate.getAttrs().forEach(x->{
             dnyCate.set(x.getAttr(), request.getParameter(x.getAttr()));
@@ -29,7 +27,7 @@ public class DnyController {
         dnyService.save(dnyCate);
 
         return JBean.by(200,"").toJson();
-    }
+    }*/
 
     /**
      * 查询某一类别列表数据-（行转列）
@@ -39,7 +37,7 @@ public class DnyController {
      * @param ps
      * @return
      */
-    public String findList(HttpServletRequest request, DnyCate dnyCate, int pn, int ps){
+    /*public String findList(HttpServletRequest request, DnyCate dnyCate, int pn, int ps){
         //deal Attr
         dnyCate.getAttrs().forEach(x->{
             dnyCate.set(x.getAttr(), request.getParameter(x.getAttr()));
@@ -48,7 +46,7 @@ public class DnyController {
         PageBean list = dnyService.findList(dnyCate, pn, ps);
 
         return JBean.by(200,"", list).toJson();
-    }
+    }*/
 
 
     //---------- 属性管理 -----------

src/com/eversec/kit/creator/ICreator.java

@@ -1,11 +1,11 @@
 package com.eversec.kit.creator;
 
+import com.eversec.common.ExcelKit;
 import com.eversec.common.FileKit;
 import com.eversec.common.Kv;
 import com.eversec.service.CfgBean;
 import com.google.gson.Gson;
 import com.jfinal.template.Engine;
-import com.lxyer.excel.poi.ExcelKit;
 
 import java.io.File;
 import java.io.IOException;

src/com/eversec/kit/dev/DataKit.java

@@ -1,7 +1,7 @@
 package com.eversec.kit.dev;
 
+import com.eversec.common.ExcelKit;
 import com.eversec.common.FileKit;
-import com.lxyer.excel.poi.ExcelKit;
 import org.junit.Test;
 
 import java.io.File;

src/com/eversec/kit/dev/Dict2Db.java

@@ -1,9 +1,9 @@
 package com.eversec.kit.dev;
 
+import com.eversec.common.ExcelKit;
 import com.eversec.common.FileKit;
 import com.eversec.common.Kv;
 import com.jfinal.template.Engine;
-import com.lxyer.excel.poi.ExcelKit;
 import org.junit.Test;
 
 import java.io.File;

src/com/eversec/service/AbcService.java

@@ -1,8 +1,8 @@
 package com.eversec.service;
 
+import com.eversec.common.ExcelKit;
 import com.eversec.common.JBean;
 import com.eversec.kit.creator.Runner;
-import com.lxyer.excel.poi.ExcelKit;
 import org.redkale.net.http.RestMapping;
 import org.redkale.net.http.RestService;