删除 cn.reghao.devops.manager.util.db.PageList

manager/src/main/java/cn/reghao/devops/manager/account/controller/page/RolePageController.java

@@ -3,7 +3,6 @@ package cn.reghao.devops.manager.account.controller.page;
 import cn.reghao.devops.manager.account.db.query.RoleQuery;
 import cn.reghao.devops.manager.account.model.po.User;
 import cn.reghao.devops.manager.account.model.vo.RoleVO;
-import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,19 +33,16 @@ public class RolePageController {
     @GetMapping
     public String rolePage(@RequestParam(value = "name", required = false) String name, Model model) {
         Page<RoleVO> page;
-        PageList<RoleVO> pageList;
         if (name != null) {
             List<RoleVO> list = roleQuery.getByMatchName(name);
             page = new PageImpl<>(list);
-            pageList = PageList.pageList(page);
         } else {
             PageRequest pageRequest = PageSort.pageRequest();
             page = roleQuery.getRoleVOByPage(pageRequest);
-            pageList = PageList.pageList(page);
         }
 
         model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
+        model.addAttribute("list", page.getContent());
         return "/rbac/role/index";
     }
 

manager/src/main/java/cn/reghao/devops/manager/account/controller/page/UserPageController.java

@@ -6,21 +6,18 @@ import cn.reghao.devops.manager.account.model.po.Role;
 import cn.reghao.devops.manager.account.model.po.User;
 import cn.reghao.devops.manager.account.model.vo.UserVO;
 import cn.reghao.devops.manager.account.service.UserContext;
-import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -33,29 +30,36 @@ import java.util.stream.Collectors;
 public class UserPageController {
     private final UserQuery userQuery;
     private final RoleQuery roleQuery;
+    private SessionRegistry sessionRegistry;
 
-    public UserPageController(UserQuery userQuery, RoleQuery roleQuery) {
+    public UserPageController(UserQuery userQuery, RoleQuery roleQuery, SessionRegistry sessionRegistry) {
         this.userQuery = userQuery;
         this.roleQuery = roleQuery;
+        this.sessionRegistry = sessionRegistry;
     }
 
     @ApiOperation(value = "用户列表页面")
     @GetMapping
     public String userPage(@RequestParam(value = "screenName", required = false) String screenName, Model model) {
+        List<Object> users = sessionRegistry.getAllPrincipals();
+        List<User> userList = new ArrayList<>();
+        for (Object obj : users) {
+            if (obj instanceof User) {
+                userList.add((User) obj);
+            }
+        }
+
         Page<UserVO> page;
-        PageList<UserVO> pageList;
         if (screenName != null) {
             List<UserVO> list = userQuery.getByMatchScreenName(screenName);
             page = new PageImpl<>(list);
-            pageList = PageList.pageList(page);
         } else {
             PageRequest pageRequest = PageSort.pageRequest();
             page = userQuery.getUserVOByPage(pageRequest);
-            pageList = PageList.pageList(page);
         }
 
         model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
+        model.addAttribute("list", page.getContent());
         return "/rbac/user/index";
     }
 

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/AppConfigPageController.java

@@ -9,7 +9,6 @@ import cn.reghao.devops.manager.app.model.constant.AppType;
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
 import cn.reghao.devops.manager.util.DefaultSetting;
-import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import cn.reghao.devops.manager.app.db.query.AppConfigQuery;
 import io.swagger.annotations.Api;
@@ -68,23 +67,21 @@ public class AppConfigPageController {
             map.put("appName", appName);
             List<AppConfig> list = appConfigQuery.query(map);
             Page<AppConfig> page = new PageImpl<>(list);
-            PageList<AppConfig> pageList = PageList.pageList(page);
 
             model.addAttribute("env", env);
             model.addAttribute("type", type);
             model.addAttribute("page", page);
-            model.addAttribute("list", pageList.getList());
+            model.addAttribute("list", page.getContent());
             return "/app/config/app/index";
         }
 
         PageRequest pageRequest = PageSort.pageRequest();
         Page<AppConfig> appPage = appConfigQuery.findByEnvAndType(env, type, pageRequest);
-        PageList<AppConfig> pageList = PageList.pageList(appPage);
 
         model.addAttribute("env", env);
         model.addAttribute("type", type);
         model.addAttribute("page", appPage);
-        model.addAttribute("list", pageList.getList());
+        model.addAttribute("list", appPage.getContent());
         return "/app/config/app/index";
     }
 

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/CompilerPageController.java

@@ -5,7 +5,6 @@ import cn.reghao.devops.manager.app.db.repository.config.build.CompilerConfigRep
 import cn.reghao.devops.common.build.model.constant.CompileType;
 import cn.reghao.devops.manager.app.model.po.config.build.CompilerConfig;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
-import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,10 +40,9 @@ public class CompilerPageController {
     public String compilerConfigPage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
         Page<CompilerConfig> page = compilerConfigRepository.findAll(pageRequest);
-        PageList<CompilerConfig> pageList = PageList.pageList(page);
 
         model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
+        model.addAttribute("list", page.getContent());
         return "/app/config/compiler/index";
     }
 

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/PackerPageController.java

@@ -5,7 +5,6 @@ import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.manager.app.db.repository.config.build.PackerConfigRepository;
 import cn.reghao.devops.manager.app.model.po.config.build.PackerConfig;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
-import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,10 +40,9 @@ public class PackerPageController {
     public String packerPage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
         Page<PackerConfig> page = packerConfigRepository.findAll(pageRequest);
-        PageList<PackerConfig> pageList = PageList.pageList(page);
 
         model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
+        model.addAttribute("list", page.getContent());
         return "/app/config/packer/index";
     }
 

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/RepoAuthPageController.java

@@ -5,7 +5,6 @@ import cn.reghao.devops.common.build.model.constant.RepoAuthType;
 import cn.reghao.devops.common.build.model.constant.RepoType;
 import cn.reghao.devops.manager.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
-import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,10 +40,9 @@ public class RepoAuthPageController {
     public String repoAuthPage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
         Page<RepoAuthConfig> page = repoAuthConfigRepository.findAll(pageRequest);
-        PageList<RepoAuthConfig> pageList = PageList.pageList(page);
 
         model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
+        model.addAttribute("list", page.getContent());
         return "/app/config/repoauth/index";
     }
 

manager/src/main/java/cn/reghao/devops/manager/app/service/page/config/AppConfigPage.java

@@ -1,16 +1,10 @@
 package cn.reghao.devops.manager.app.service.page.config;
 
-import cn.reghao.devops.manager.app.model.po.config.AppConfig;
-import cn.reghao.devops.manager.util.db.PageList;
-import org.springframework.data.domain.Pageable;
-
 /**
  * @author reghao
  * @date 2021-10-22 09:15:56
  */
 public interface AppConfigPage {
-    PageList<AppConfig> indexPage(String env, Pageable pageable);
-    PageList<AppConfig> searchResultPage(String appName);
     void addOrEditPage();
     void copyPage();
     void detailPage();

manager/src/main/java/cn/reghao/devops/manager/util/db/PageList.java

@@ -1,45 +0,0 @@
-package cn.reghao.devops.manager.util.db;
-
-import lombok.Data;
-import org.springframework.data.domain.Page;
-
-import java.util.List;
-
-/**
- * 分页列表
- *
- * @author reghao
- * @date 2020-03-05 17:39:53
- */
-@Data
-@Deprecated
-public class PageList<T> {
-    // 每页大小
-    private int pageSize;
-    // 总数量
-    private long totalSize;
-    // 总页数
-    private int totalPages;
-    // 是否最后一页
-    private boolean hasNext;
-    private List<T> list;
-
-    public static <T> PageList<T> pageList(Page<T> page) {
-        PageList<T> pageList = new PageList<>();
-        pageList.setPageSize(page.getSize());
-        pageList.setTotalSize(page.getTotalElements());
-        pageList.setTotalPages(page.getTotalPages());
-        pageList.setHasNext(page.hasNext());
-        pageList.setList(page.getContent());
-        return pageList;
-    }
-
-    public static <T> PageList<T> emptyPageList(Page page) {
-        PageList<T> pageList = new PageList<>();
-        pageList.setPageSize(page.getSize());
-        pageList.setTotalSize(page.getTotalElements());
-        pageList.setTotalPages(page.getTotalPages());
-        pageList.setHasNext(page.hasNext());
-        return pageList;
-    }
-}