From 1584ff5477b0d9085e2a71287d3a23f7ccb7cd00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=89=91=E9=94=8B?= <1822213252@qq.com>
Date: Tue, 29 Nov 2022 07:13:50 +0000
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=9E=84=E9=80=A0?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 梁剑锋 <1822213252@qq.com>
---
 .../ruoyi/common/core/page/TableDataInfo.java | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

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 5f3f2d1ad..8dc738d7d 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
@@ -50,12 +50,10 @@ public class TableDataInfo<T> implements Serializable {
         this.total = total;
     }
 
-    public static <T> TableDataInfo<T> build(IPage<T> page) {
+    public static <T> TableDataInfo<T> build() {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);
         rspData.setMsg("查询成功");
-        rspData.setRows(page.getRecords());
-        rspData.setTotal(page.getTotal());
         return rspData;
     }
 
@@ -68,10 +66,48 @@ public class TableDataInfo<T> implements Serializable {
         return rspData;
     }
 
-    public static <T> TableDataInfo<T> build() {
+    public static <T> TableDataInfo<T> build(IPage<T> page) {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);
         rspData.setMsg("查询成功");
+        rspData.setRows(page.getRecords());
+        rspData.setTotal(page.getTotal());
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> build(List<T> list, long total) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(total);
+        return rspData;
+    }
+    
+    public static <T> TableDataInfo<T> build(List<?> list, long total, Class<T> clazz) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setTotal(total);
+        rspData.setRows(BeanUtil.copyToList(list, clazz));
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> build(Page<?> page, Class<T> clazz) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setTotal(page.getTotal());
+        rspData.setRows(BeanUtil.copyToList(page.getRecords(), clazz));
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> convert(TableDataInfo<?> tableDataInfo, Class<T> clazz) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(tableDataInfo.getCode());
+        rspData.setMsg(tableDataInfo.getMsg());
+        rspData.setTotal(tableDataInfo.getTotal());
+        rspData.setRows(BeanUtil.copyToList(tableDataInfo.getRows(), clazz));
         return rspData;
     }