refactor(admin): 更新字典数据DTO和VO的注解以及分页处理逻辑

admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java

@@ -64,7 +64,7 @@ public class DictDataDto {
     /**
      * 状态（1正常 0停用）
      */
-    @ApiModelProperty(value = "状态（1正常 0停用）",required = true)
+    @Schema(description = "状态（1正常 0停用）",required = true)
     @NotNull(message = "状态不能为空!")
     private String state;
 }

admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java

@@ -69,11 +69,11 @@ public class DictDataVo implements Serializable {
     /**
      * 状态（1正常 0停用）
      */
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @Schema(description = "状态（1正常 0停用）")
     private String state;
 
 
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
 

admin/admin-biz/src/main/java/cn/fateverse/admin/mapper/UserMapper.java

@@ -2,8 +2,11 @@ package cn.fateverse.admin.mapper;
 
 import cn.fateverse.admin.query.UserQuery;
 import cn.fateverse.admin.vo.UserVo;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.common.core.entity.UserBase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -43,7 +46,7 @@ public interface UserMapper extends BaseMapper<UserBase> {
      * @param roleId 角色id
      * @return 表格数据信息
      */
-    List<UserVo> selectUserListByExcludeRoleId(@Param("roleId") Long roleId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
+    IPage<UserVo> selectUserListByExcludeRoleId(@Param("page") IPage<UserVo> page, @Param("roleId") Long roleId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
 
 
     /**
@@ -54,7 +57,7 @@ public interface UserMapper extends BaseMapper<UserBase> {
      * @param phoneNumber 手机号码
      * @return 用户列表
      */
-    List<UserVo> selectUserListByExcludePostId(@Param("postId") Long postId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
+    IPage<UserVo> selectUserListByExcludePostId(@Param("page") IPage<UserVo> page, @Param("postId") Long postId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber);
 
 
     /**

admin/admin-biz/src/main/java/cn/fateverse/admin/service/UserService.java

@@ -6,6 +6,7 @@ import cn.fateverse.admin.vo.UserChooseVo;
 import cn.fateverse.admin.vo.UserDetailVo;
 import cn.fateverse.admin.vo.UserVo;
 import cn.fateverse.common.core.entity.User;
+import cn.fateverse.common.core.entity.UserBase;
 import cn.fateverse.common.core.result.page.TableDataInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,7 +16,7 @@ import java.util.List;
  * @author Clay
  * @date 2022/10/30
  */
-public interface UserService extends IService<User> {
+public interface UserService extends IService<UserBase> {
 
     /**
      * 通过用户名查询用户信息

admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import cn.fateverse.admin.vo.UserChooseVo;
 import cn.fateverse.admin.vo.UserDetailVo;
 import cn.fateverse.admin.vo.UserVo;
 import cn.fateverse.common.core.entity.Dept;
+import cn.fateverse.common.core.entity.Role;
 import cn.fateverse.common.core.entity.User;
 import cn.fateverse.common.core.entity.UserBase;
 import cn.fateverse.common.core.exception.CustomException;
@@ -20,7 +21,10 @@ import cn.fateverse.common.core.utils.ObjectUtils;
 import cn.fateverse.common.mybatisplus.utils.PageUtils;
 import cn.fateverse.common.security.utils.SecurityUtils;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,29 +41,16 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
         implements UserService {
 
     private final UserMapper userMapper;
-
     private final UserRoleMapper userRoleMapper;
-
     private final UserPostMapper userPostMapper;
-
     private final RoleMapper roleMapper;
-
     private final DeptMapper deptMapper;
 
-    public UserServiceImpl(UserMapper userMapper,
-                           UserRoleMapper userRoleMapper,
-                           UserPostMapper userPostMapper,
-                           RoleMapper roleMapper, DeptMapper deptMapper) {
-        this.userMapper = userMapper;
-        this.userRoleMapper = userRoleMapper;
-        this.userPostMapper = userPostMapper;
-        this.roleMapper = roleMapper;
-        this.deptMapper = deptMapper;
-    }
 
     @Override
     public User searchByUserName(String username) {
@@ -160,10 +151,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
 
     @Override
     public TableDataInfo<UserVo> searchUserListByExcludeRoleId(Long roleId, String userName, String phoneNumber) {
-        PageUtils.startPage();
+        Page<UserVo> page = PageUtils.getPage();
-        List<UserVo> list = userMapper.selectUserListByExcludeRoleId(roleId, userName, phoneNumber);
+        IPage<UserVo> mapperPage = userMapper.selectUserListByExcludeRoleId(page, roleId, userName, phoneNumber);
-        Long total = PageUtils.getTotal(list);
+        return PageUtils.convertDataTable(mapperPage);
-        return PageUtils.convertDataTable(list, total);
     }
 
 
@@ -197,10 +187,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
 
     @Override
     public TableDataInfo<UserVo> searchUserListByExcludePostId(Long postId, String userName, String phoneNumber) {
-        PageUtils.startPage();
+        IPage<UserVo> page = PageUtils.getPage();
-        List<UserVo> list = userMapper.selectUserListByExcludePostId(postId, userName, phoneNumber);
+        IPage<UserVo> mapperPage = userMapper.selectUserListByExcludePostId(page, postId, userName, phoneNumber);
-        Long total = PageUtils.getTotal(list);
+        return PageUtils.convertDataTable(mapperPage);
-        return PageUtils.convertDataTable(list, total);
     }
 
 
@@ -266,15 +255,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
 
     @Override
     public TableDataInfo<UserVo> searchUserListByExcludeDeptId(Long deptId, String userName, String phoneNumber) {
-        PageUtils.startPage();
+//        PageUtils.startPage();
-        Dept dept = deptMapper.selectById(deptId);
+//        Dept dept = deptMapper.selectById(deptId);
-        if (null == dept) {
+//        if (null == dept) {
-            throw new CustomException("当前部门不存在");
+//            throw new CustomException("当前部门不存在");
-        }
+//        }
-//        dept.getAncestors()
+////        dept.getAncestors()
-        List<UserVo> list = userMapper.searchUserListByExcludeDeptId(deptId, userName, phoneNumber);
+//        List<UserVo> list = userMapper.searchUserListByExcludeDeptId(deptId, userName, phoneNumber);
-        Long total = PageUtils.getTotal(list);
+//        Long total = PageUtils.getTotal(list);
-        return PageUtils.convertDataTable(list, total);
+//        return PageUtils.convertDataTable(list, total);
+        return PageUtils.emptyTable();
     }
 
     @Override
@@ -423,4 +413,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserBase>
     }
 
 
+
+
 }

common/common-mybatis-puls/src/main/java/cn/fateverse/common/mybatisplus/utils/PageUtils.java

@@ -3,6 +3,7 @@ package cn.fateverse.common.mybatisplus.utils;
 import cn.fateverse.common.core.entity.PageInfo;
 import cn.fateverse.common.core.result.page.TableDataInfo;
 import cn.fateverse.common.core.utils.TableSupport;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.ArrayList;
@@ -26,12 +27,22 @@ public class PageUtils {
      * @param <R>  需要转换的对象类型
      * @return 转换后的对象
      */
-    public static <T, R> TableDataInfo<T> convertDataTable(Page<R> page, Function<R, T> map) {
+    public static <T, R> TableDataInfo<T> convertDataTable(IPage<R> page, Function<R, T> map) {
         List<T> convertList = page.getRecords().stream().map(map).collect(Collectors.toList());
         return convertDataTable(convertList, page.getTotal());
     }
 
 
+    public static <T> TableDataInfo<T> convertDataTable(IPage<T> page) {
+        return convertDataTable(page.getRecords(), page.getTotal());
+    }
+
+
+    public static <T> TableDataInfo<T> emptyTable() {
+        return convertDataTable(new ArrayList<>(), 0L);
+    }
+
+
     /**
      * 转换为TableDataInfo对象
      *