From 5d3580cbcf8d8ebd89530deb80c11ec2afb4ccd2 Mon Sep 17 00:00:00 2001
From: zhangxiaoxiang <1090510535@qq.com>
Date: Sun, 1 Sep 2024 10:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B91:=E5=88=86=E9=A1=B5=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BD=93TableDataInfo=E6=94=B9=E6=88=90=E6=B3=9B?=
 =?UTF-8?q?=E5=9E=8B=E7=B1=BBTableDataInfo<T>,=E6=96=B9=E4=BE=BF=E9=9B=86?=
 =?UTF-8?q?=E6=88=903=E6=96=B9API=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B92:BaseController=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=88=86=E9=A1=B5=E6=96=B9=E6=B3=95getDataTa?=
 =?UTF-8?q?bleByFunction,=E6=96=B9=E4=BE=BF=E6=8E=A7=E5=88=B6=E5=B1=82?=
 =?UTF-8?q?=E5=B0=91=E5=86=99=E4=B8=80=E4=B8=AAstartPage();=E5=BD=93?=
 =?UTF-8?q?=E7=84=B6=E5=95=A6,pagehelper=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=BD=A0=E7=9F=A5=E9=81=93=E7=9A=84=E8=AF=9D=E6=9C=80?=
 =?UTF-8?q?=E5=A5=BD=E5=95=A6,=E4=BB=A5=E5=85=8D=E9=80=A0=E6=88=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/controller/BaseController.java       | 19 ++++++++++++++++---
 .../ruoyi/common/core/page/TableDataInfo.java | 14 +++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index c2985040a..a3e7e9d86 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -3,6 +3,7 @@ package com.ruoyi.common.core.controller;
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
+import java.util.function.Supplier;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -27,7 +28,7 @@ import com.ruoyi.common.utils.sql.SqlUtil;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author ruoyi
  */
 public class BaseController
@@ -117,9 +118,21 @@ public class BaseController
         return rspData;
     }
 
+    /**
+     *
+     * 响应请求分页数据
+     * @param supplier 待分页函数
+     * @return 分页结果
+     */
+    protected TableDataInfo getDataTableByFunction(Supplier<List<?>> supplier)
+    {
+        startPage();
+        return getDataTable(supplier.get());
+    }
+
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
@@ -130,7 +143,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param result 结果
      * @return 操作结果
      */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
index 29f60e7fc..cc93e4fb0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
@@ -5,10 +5,10 @@ import java.util.List;
 
 /**
  * 表格分页数据对象
- * 
+ *
  * @author ruoyi
  */
-public class TableDataInfo implements Serializable
+public class TableDataInfo<T> implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
@@ -16,7 +16,7 @@ public class TableDataInfo implements Serializable
     private long total;
 
     /** 列表数据 */
-    private List<?> rows;
+    private List<T> rows;
 
     /** 消息状态码 */
     private int code;
@@ -33,11 +33,11 @@ public class TableDataInfo implements Serializable
 
     /**
      * 分页
-     * 
+     *
      * @param list 列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total)
+    public TableDataInfo(List<T> list, int total)
     {
         this.rows = list;
         this.total = total;
@@ -58,7 +58,7 @@ public class TableDataInfo implements Serializable
         return rows;
     }
 
-    public void setRows(List<?> rows)
+    public void setRows(List<T> rows)
     {
         this.rows = rows;
     }
@@ -82,4 +82,4 @@ public class TableDataInfo implements Serializable
     {
         this.msg = msg;
     }
-}
\ No newline at end of file
+}