From dd25573ebce3450d90d0012a30b12a5185bc7310 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 08 七月 2022 15:49:15 +0800
Subject: [PATCH] update 使用 @param 注释替换 @Parameter 注解 fix 修复 token 无法传递 与 无法持久化问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java | 99 +++++++++++++++++++++++--------------------------
1 files changed, 46 insertions(+), 53 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 847685b..5f3f2d1 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
@@ -1,85 +1,78 @@
package com.ruoyi.common.core.page;
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
import java.io.Serializable;
import java.util.List;
/**
* 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public class TableDataInfo implements Serializable
-{
+
+@Data
+@NoArgsConstructor
+public class TableDataInfo<T> implements Serializable {
private static final long serialVersionUID = 1L;
- /** 鎬昏褰曟暟 */
+ /**
+ * 鎬昏褰曟暟
+ */
private long total;
- /** 鍒楄〃鏁版嵁 */
- private List<?> rows;
+ /**
+ * 鍒楄〃鏁版嵁
+ */
+ private List<T> rows;
- /** 娑堟伅鐘舵�佺爜 */
+ /**
+ * 娑堟伅鐘舵�佺爜
+ */
private int code;
- /** 娑堟伅鍐呭 */
+ /**
+ * 娑堟伅鍐呭
+ */
private String msg;
/**
- * 琛ㄦ牸鏁版嵁瀵硅薄
- */
- public TableDataInfo()
- {
- }
-
- /**
* 鍒嗛〉
- *
- * @param list 鍒楄〃鏁版嵁
+ *
+ * @param list 鍒楄〃鏁版嵁
* @param total 鎬昏褰曟暟
*/
- public TableDataInfo(List<?> list, int total)
- {
+ public TableDataInfo(List<T> list, long total) {
this.rows = list;
this.total = total;
}
- public long getTotal()
- {
- return total;
+ 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 void setTotal(long total)
- {
- this.total = total;
+ public static <T> TableDataInfo<T> build(List<T> list) {
+ TableDataInfo<T> rspData = new TableDataInfo<>();
+ rspData.setCode(HttpStatus.HTTP_OK);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ rspData.setRows(list);
+ rspData.setTotal(list.size());
+ return rspData;
}
- public List<?> getRows()
- {
- return rows;
+ public static <T> TableDataInfo<T> build() {
+ TableDataInfo<T> rspData = new TableDataInfo<>();
+ rspData.setCode(HttpStatus.HTTP_OK);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ return rspData;
}
- public void setRows(List<?> rows)
- {
- this.rows = rows;
- }
-
- public int getCode()
- {
- return code;
- }
-
- public void setCode(int code)
- {
- this.code = code;
- }
-
- public String getMsg()
- {
- return msg;
- }
-
- public void setMsg(String msg)
- {
- this.msg = msg;
- }
}
--
Gitblit v1.9.3