From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 24 十二月 2021 11:36:02 +0800 Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework --- ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java | 89 ++++++++++++++++++++++++++++++++------------ 1 files changed, 65 insertions(+), 24 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 72c284f..46b01b9 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,6 +1,11 @@ package com.ruoyi.common.core.page; -import lombok.*; +import cn.hutool.http.HttpStatus; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serializable; @@ -8,39 +13,75 @@ /** * 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄 - * - * @author ruoyi + * + * @author Lion Li */ @Data @NoArgsConstructor @Accessors(chain = true) -public class TableDataInfo<T> implements Serializable -{ - private static final long serialVersionUID = 1L; +@ApiModel("鍒嗛〉鍝嶅簲瀵硅薄") +public class TableDataInfo<T> implements Serializable { + private static final long serialVersionUID = 1L; - /** 鎬昏褰曟暟 */ - private long total; + /** + * 鎬昏褰曟暟 + */ + @ApiModelProperty("鎬昏褰曟暟") + private long total; - /** 鍒楄〃鏁版嵁 */ - private List<T> rows; + /** + * 鍒楄〃鏁版嵁 + */ + @ApiModelProperty("鍒楄〃鏁版嵁") + private List<T> rows; - /** 娑堟伅鐘舵�佺爜 */ - private int code; + /** + * 娑堟伅鐘舵�佺爜 + */ + @ApiModelProperty("娑堟伅鐘舵�佺爜") + private int code; - /** 娑堟伅鍐呭 */ - private String msg; + /** + * 娑堟伅鍐呭 + */ + @ApiModelProperty("娑堟伅鍐呭") + private String msg; - /** - * 鍒嗛〉 - * - * @param list 鍒楄〃鏁版嵁 - * @param total 鎬昏褰曟暟 - */ - public TableDataInfo(List<T> list, int total) - { - this.rows = list; - this.total = total; + /** + * 鍒嗛〉 + * + * @param list 鍒楄〃鏁版嵁 + * @param total 鎬昏褰曟暟 + */ + public TableDataInfo(List<T> list, long total) { + this.rows = list; + this.total = 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 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 static <T> TableDataInfo<T> build() { + TableDataInfo<T> rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.HTTP_OK); + rspData.setMsg("鏌ヨ鎴愬姛"); + return rspData; } } -- Gitblit v1.9.3