1

nladmin-system/nlsso-server/src/main/java/org/nl/common/TableDataInfo.java

@@ -0,0 +1,78 @@
+package org.nl.common;
+
+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 Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+public class TableDataInfo<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总记录数
+     */
+    private long totalElements;
+
+    /**
+     * 列表数据
+     */
+    private List<T> content;
+
+    /**
+     * 消息状态码
+     */
+    private int code;
+
+    /**
+     * 消息内容
+     */
+    private String msg;
+
+    /**
+     * 分页
+     *
+     * @param list  列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<T> list, long total) {
+        this.content = list;
+        this.totalElements = total;
+    }
+
+    public static <T> TableDataInfo<T> build(IPage<T> page) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setContent(page.getRecords());
+        rspData.setTotalElements(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.setContent(list);
+        rspData.setTotalElements(list.size());
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> build() {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        return rspData;
+    }
+
+}

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java

@@ -1,18 +1,13 @@
 package org.nl.system.controller.role;
 
-
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.system.service.role.ISysRoleService;
-import org.nl.system.service.role.dao.SysRole;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -36,8 +31,8 @@ public class SysRoleController {
     @ApiOperation("分页查询角色")
     @GetMapping
     @SaCheckPermission("roles:list")
-    public ResponseEntity<Object> pageQuery(@RequestParam Map param, Pageable page) {
+    public ResponseEntity<Object> pageQuery(@RequestParam Map param, PageQuery page) {
-        return new ResponseEntity<>(roleService.query(param, page), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK);
     }
 
     @Log("新增角色")