优化分页对象

common-util/src/main/java/com/secoo/mall/common/util/bean/BeanUtil.java

@@ -36,7 +36,9 @@ public class BeanUtil extends BeanUtils {
             return Maps.newHashMapWithExpectedSize(0);
         }
         try {
-            return PropertyUtils.describe(object);
+            Map<String, Object> dataMap = PropertyUtils.describe(object);
+            dataMap.remove("class");
+            return dataMap;
         } catch (Exception e) {
             throw new SystemInternalException();
         }

mybatis-starter/src/main/java/com/secoo/mall/mybatis/bean/DataPage.java

@@ -2,11 +2,14 @@ package com.secoo.mall.mybatis.bean;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.secoo.mall.common.core.bean.Pageable;
+import com.secoo.mall.common.util.colletion.CollectionUtil;
 
 import java.util.List;
 
 public class DataPage<T> implements Pageable<T> {
 
+    private List dataList;
+
     private Page<T> page;
 
     public DataPage(Page<T> page) {
@@ -15,6 +18,9 @@ public class DataPage<T> implements Pageable<T> {
 
     @Override
     public List<T> getResultList() {
+        if (CollectionUtil.isNotEmpty(dataList)) {
+            return dataList;
+        }
         return page.getRecords();
     }
 
@@ -32,4 +38,9 @@ public class DataPage<T> implements Pageable<T> {
     public Long getPageSize() {
         return page.getSize();
     }
+
+
+    public void setDataList(List dataList) {
+        this.dataList = dataList;
+    }
 }

mybatis-starter/src/main/java/com/secoo/mall/mybatis/util/PageUtil.java

@@ -6,6 +6,7 @@ import com.secoo.mall.common.constant.PageConstant;
 import com.secoo.mall.common.core.bean.ReqPage;
 import com.secoo.mall.common.core.bean.Sort;
 import com.secoo.mall.common.core.exception.ParameterException;
+import com.secoo.mall.common.util.colletion.CollectionUtil;
 import com.secoo.mall.common.util.string.StringUtil;
 import com.secoo.mall.mybatis.bean.DataPage;
 import org.apache.commons.lang3.StringUtils;
@@ -73,5 +74,12 @@ public interface PageUtil {
         }
     }
 
+    static void setResultList(DataPage dataPage, List dataList) {
+        if (CollectionUtil.isEmpty(dataList)) {
+            dataList = new ArrayList();
+        }
+        dataPage.setDataList(dataList);
+    }
+
 
 }