Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen

bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/controller/BaseController.java

@@ -3,6 +3,10 @@ package com.bonus.common.core.web.controller;
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.bonus.common.core.web.page.PageDomain;
+import com.bonus.common.core.web.page.TableSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,7 +20,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author bonus
  */
 public class BaseController
@@ -69,6 +73,19 @@ public class BaseController
         rspData.setTotal(new PageInfo(list).getTotal());
         return rspData;
     }
+    protected TableDataInfo getDataTable1(List<?> list)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        rspData.setTotal(list.size());
+        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setMsg("查询成功");
+        return rspData;
+    }
     /**
      * 响应请求分页数据
      */
@@ -132,7 +149,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
@@ -143,7 +160,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param result 结果
      * @return 操作结果
      */