xuxueli · liuyanjun3366 · Jan 7, 2019
diff --git a/pom.xml b/pom.xml
@@ -22,6 +22,7 @@
 
         <slf4j-api.version>1.7.25</slf4j-api.version>
         <poi.version>3.17</poi.version>
+        <common.beanutils.version>1.9.3</common.beanutils.version>
     </properties>
 
     <dependencies>
@@ -45,6 +46,11 @@
             <version>${poi.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>${common.beanutils.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/java/com/xuxueli/poi/excel/ExcelCommonUtil.java b/src/main/java/com/xuxueli/poi/excel/ExcelCommonUtil.java
@@ -0,0 +1,62 @@
+package com.xuxueli.poi.excel;
+
+
+import com.xuxueli.poi.excel.annotation.ExcelField;
+import com.xuxueli.poi.excel.util.FieldForSort;
+import org.apache.commons.beanutils.BeanComparator;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.ComparatorUtils;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ComparatorChain;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class ExcelCommonUtil {
+    public static List<FieldForSort> sortFieldByAnno(Class<?> clazz) {
+        Field[] fieldsArr = clazz.getDeclaredFields();
+        List<FieldForSort> fields = new ArrayList<FieldForSort>();
+        for (Field field : fieldsArr) {
+            ExcelField ec = field.getAnnotation(ExcelField.class);
+            if (ec == null) {
+                // 没有ExcelCell Annotation 视为不汇入
+                continue;
+            }
+            int id = ec.index();
+            fields.add(new FieldForSort(field, id));
+        }
+        sortByProperties(fields, true, false, "index");
+        return fields;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void sortByProperties(List<? extends Object> list, boolean isNullHigh, boolean isReversed,
+                                         String... props) {
+        if (CollectionUtils.isNotEmpty(list)) {
+            Comparator<?> typeComp = ComparableComparator.INSTANCE;
+            if (isNullHigh == true) {
+                typeComp = ComparatorUtils.nullHighComparator(typeComp);
+            } else {
+                typeComp = ComparatorUtils.nullLowComparator(typeComp);
+            }
+            if (isReversed) {
+                typeComp = ComparatorUtils.reversedComparator(typeComp);
+            }
+
+            List<Object> sortCols = new ArrayList<Object>();
+
+            if (props != null) {
+                for (String prop : props) {
+                    sortCols.add(new BeanComparator(prop, typeComp));
+                }
+            }
+            if (sortCols.size() > 0) {
+                Comparator<Object> sortChain = new ComparatorChain(sortCols);
+                Collections.sort(list, sortChain);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/xuxueli/poi/excel/ExcelExportUtil.java b/src/main/java/com/xuxueli/poi/excel/ExcelExportUtil.java
@@ -2,6 +2,7 @@
 
 import com.xuxueli.poi.excel.annotation.ExcelField;
 import com.xuxueli.poi.excel.annotation.ExcelSheet;
+import com.xuxueli.poi.excel.util.FieldForSort;
 import com.xuxueli.poi.excel.util.FieldReflectionUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
@@ -11,7 +12,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -85,13 +85,17 @@ private static void makeSheet(Workbook workbook, List<?> sheetDataList){
 
         // sheet field
         List<Field> fields = new ArrayList<Field>();
-        if (sheetClass.getDeclaredFields()!=null && sheetClass.getDeclaredFields().length>0) {
-            for (Field field: sheetClass.getDeclaredFields()) {
-                if (Modifier.isStatic(field.getModifiers())) {
-                    continue;
+        List<FieldForSort> fieldSorts = ExcelCommonUtil.sortFieldByAnno(sheetClass);
+          /*  if (sheetClass.getDeclaredFields()!=null && sheetClass.getDeclaredFields().length>0) {
+                for (Field field: sheetClass.getDeclaredFields()) {
+                    if (Modifier.isStatic(field.getModifiers())) {
+                        continue;
+                    }
+                    fields.add(field);
                 }
-                fields.add(field);
-            }
+            }*/
+        for (FieldForSort fieldForSort:fieldSorts){
+            fields.add(fieldForSort.getField());
         }
 
         if (fields==null || fields.size()==0) {

diff --git a/src/main/java/com/xuxueli/poi/excel/ExcelImportUtil.java b/src/main/java/com/xuxueli/poi/excel/ExcelImportUtil.java
@@ -1,6 +1,7 @@
 package com.xuxueli.poi.excel;
 
 import com.xuxueli.poi.excel.annotation.ExcelSheet;
+import com.xuxueli.poi.excel.util.FieldForSort;
 import com.xuxueli.poi.excel.util.FieldReflectionUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
@@ -11,7 +12,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -44,13 +44,17 @@ public static List<Object> importSheet(Workbook workbook, Class<?> sheetClass) {
 
             // sheet field
             List<Field> fields = new ArrayList<Field>();
-            if (sheetClass.getDeclaredFields()!=null && sheetClass.getDeclaredFields().length>0) {
+            List<FieldForSort> fieldSorts = ExcelCommonUtil.sortFieldByAnno(sheetClass);
+          /*  if (sheetClass.getDeclaredFields()!=null && sheetClass.getDeclaredFields().length>0) {
                 for (Field field: sheetClass.getDeclaredFields()) {
                     if (Modifier.isStatic(field.getModifiers())) {
                         continue;
                     }
                     fields.add(field);
                 }
+            }*/
+            for (FieldForSort fieldForSort:fieldSorts){
+                fields.add(fieldForSort.getField());
             }
 
             if (fields==null || fields.size()==0) {

diff --git a/src/main/java/com/xuxueli/poi/excel/annotation/ExcelField.java b/src/main/java/com/xuxueli/poi/excel/annotation/ExcelField.java
@@ -31,6 +31,11 @@
      */
     int width() default 0;
 
+    /**
+     * 字段显示顺序序号
+     */
+    int index();
+
     /**
      * 水平对齐方式
      *

diff --git a/src/main/java/com/xuxueli/poi/excel/util/FieldForSort.java b/src/main/java/com/xuxueli/poi/excel/util/FieldForSort.java
@@ -0,0 +1,61 @@
+package com.xuxueli.poi.excel.util;
+
+import java.lang.reflect.Field;
+
+/**
+ * @author liuyanjun
+ */
+public class FieldForSort {
+
+    private Field field;
+    private int index;
+
+    /**
+     * @param field
+     */
+    public FieldForSort(Field field) {
+        super();
+        this.field = field;
+    }
+
+    /**
+     * @param field
+     * @param index
+     */
+    public FieldForSort(Field field, int index) {
+        super();
+        this.field = field;
+        this.index = index;
+    }
+
+    /**
+     * @return the field
+     */
+    public Field getField() {
+        return field;
+    }
+
+    /**
+     * @param field
+     *        the field to set
+     */
+    public void setField(Field field) {
+        this.field = field;
+    }
+
+    /**
+     * @return the index
+     */
+    public int getIndex() {
+        return index;
+    }
+
+    /**
+     * @param index
+     *        the index to set
+     */
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+}
diff --git a/src/test/java/com/xuxueli/poi/excel/test/Test.java b/src/test/java/com/xuxueli/poi/excel/test/Test.java
@@ -25,7 +25,7 @@ public static void main(String[] args) {
             ShopDTO shop = new ShopDTO(true, "商户"+i, (short) i, 1000+i, 10000+i, (float) (1000+i), (double) (10000+i), new Date());
             shopDTOList.add(shop);
         }
-        String filePath = "/Users/xuxueli/Downloads/demo-sheet.xls";
+        String filePath = "E:/demo-sheet.xls";
 
         /**
          * Excel导出：Object 转换为 Excel

diff --git a/src/test/java/com/xuxueli/poi/excel/test/model/ShopDTO.java b/src/test/java/com/xuxueli/poi/excel/test/model/ShopDTO.java
@@ -15,28 +15,28 @@
 @ExcelSheet(name = "商户列表", headColor = HSSFColor.HSSFColorPredefined.LIGHT_GREEN)
 public class ShopDTO {
 
-    @ExcelField(name = "是否VIP商户")
+    @ExcelField(name = "是否VIP商户",index=1)
     private boolean vip;
 
-    @ExcelField(name = "商户名称", align = HorizontalAlignment.CENTER)
+    @ExcelField(name = "商户名称",index=2, align = HorizontalAlignment.CENTER)
     private String shopName;
 
-    @ExcelField(name = "分店数量")
+    @ExcelField(name = "分店数量",index=3)
     private short branchNum;
 
-    @ExcelField(name = "商户ID")
+    @ExcelField(name = "商户ID",index=5)
     private int shopId;
 
-    @ExcelField(name = "浏览人数")
+    @ExcelField(name = "浏览人数",index=4)
     private long visitNum;
 
-    @ExcelField(name = "当月营业额")
+    @ExcelField(name = "当月营业额",index=6)
     private float turnover;
 
-    @ExcelField(name = "历史营业额")
+    @ExcelField(name = "历史营业额",index=7)
     private double totalTurnover;
 
-    @ExcelField(name = "开店时间", dateformat = "yyyy-MM-dd HH:mm:ss")
+    @ExcelField(name = "开店时间",index=8, dateformat = "yyyy-MM-dd HH:mm:ss")
     private Date addTime;