From 183b8ddc01185fc6bb0dad27f4af0482e25741c3 Mon Sep 17 00:00:00 2001 From: lsym004933 Date: Sat, 17 Jan 2026 14:41:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E6=9B=B4=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AEDTO=E5=92=8CVO=E7=9A=84=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E4=BB=A5=E5=8F=8A=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/fateverse/admin/dto/DictDataDto.java | 2 +- .../cn/fateverse/admin/vo/DictDataVo.java | 4 +- .../cn/fateverse/admin/mapper/UserMapper.java | 7 ++- .../fateverse/admin/service/UserService.java | 3 +- .../admin/service/impl/UserServiceImpl.java | 54 ++++++++----------- .../common/mybatisplus/utils/PageUtils.java | 15 +++++- 6 files changed, 46 insertions(+), 39 deletions(-) diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java index 55fc3cb..85fcf96 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java +++ b/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; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java index 7c767db..5ac3677 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java +++ b/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; diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/mapper/UserMapper.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/mapper/UserMapper.java index d82b912..2cdbdf5 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/mapper/UserMapper.java +++ b/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 { * @param roleId 角色id * @return 表格数据信息 */ - List selectUserListByExcludeRoleId(@Param("roleId") Long roleId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber); + IPage selectUserListByExcludeRoleId(@Param("page") IPage page, @Param("roleId") Long roleId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber); /** @@ -54,7 +57,7 @@ public interface UserMapper extends BaseMapper { * @param phoneNumber 手机号码 * @return 用户列表 */ - List selectUserListByExcludePostId(@Param("postId") Long postId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber); + IPage selectUserListByExcludePostId(@Param("page") IPage page, @Param("postId") Long postId, @Param("userName") String userName, @Param("phoneNumber") String phoneNumber); /** diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/UserService.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/UserService.java index b6f2db2..5a89297 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/UserService.java +++ b/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 { +public interface UserService extends IService { /** * 通过用户名查询用户信息 diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java index 8210af8..9f8e432 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java +++ b/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 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 @Override public TableDataInfo searchUserListByExcludeRoleId(Long roleId, String userName, String phoneNumber) { - PageUtils.startPage(); - List list = userMapper.selectUserListByExcludeRoleId(roleId, userName, phoneNumber); - Long total = PageUtils.getTotal(list); - return PageUtils.convertDataTable(list, total); + Page page = PageUtils.getPage(); + IPage mapperPage = userMapper.selectUserListByExcludeRoleId(page, roleId, userName, phoneNumber); + return PageUtils.convertDataTable(mapperPage); } @@ -197,10 +187,9 @@ public class UserServiceImpl extends ServiceImpl @Override public TableDataInfo searchUserListByExcludePostId(Long postId, String userName, String phoneNumber) { - PageUtils.startPage(); - List list = userMapper.selectUserListByExcludePostId(postId, userName, phoneNumber); - Long total = PageUtils.getTotal(list); - return PageUtils.convertDataTable(list, total); + IPage page = PageUtils.getPage(); + IPage mapperPage = userMapper.selectUserListByExcludePostId(page, postId, userName, phoneNumber); + return PageUtils.convertDataTable(mapperPage); } @@ -266,15 +255,16 @@ public class UserServiceImpl extends ServiceImpl @Override public TableDataInfo searchUserListByExcludeDeptId(Long deptId, String userName, String phoneNumber) { - PageUtils.startPage(); - Dept dept = deptMapper.selectById(deptId); - if (null == dept) { - throw new CustomException("当前部门不存在"); - } -// dept.getAncestors() - List list = userMapper.searchUserListByExcludeDeptId(deptId, userName, phoneNumber); - Long total = PageUtils.getTotal(list); - return PageUtils.convertDataTable(list, total); +// PageUtils.startPage(); +// Dept dept = deptMapper.selectById(deptId); +// if (null == dept) { +// throw new CustomException("当前部门不存在"); +// } +//// dept.getAncestors() +// List list = userMapper.searchUserListByExcludeDeptId(deptId, userName, phoneNumber); +// Long total = PageUtils.getTotal(list); +// return PageUtils.convertDataTable(list, total); + return PageUtils.emptyTable(); } @Override @@ -423,4 +413,6 @@ public class UserServiceImpl extends ServiceImpl } + + } diff --git a/common/common-mybatis-puls/src/main/java/cn/fateverse/common/mybatisplus/utils/PageUtils.java b/common/common-mybatis-puls/src/main/java/cn/fateverse/common/mybatisplus/utils/PageUtils.java index 5cb1eb7..98995b3 100644 --- a/common/common-mybatis-puls/src/main/java/cn/fateverse/common/mybatisplus/utils/PageUtils.java +++ b/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 需要转换的对象类型 * @return 转换后的对象 */ - public static TableDataInfo convertDataTable(Page page, Function map) { + public static TableDataInfo convertDataTable(IPage page, Function map) { List convertList = page.getRecords().stream().map(map).collect(Collectors.toList()); return convertDataTable(convertList, page.getTotal()); } + public static TableDataInfo convertDataTable(IPage page) { + return convertDataTable(page.getRecords(), page.getTotal()); + } + + + public static TableDataInfo emptyTable() { + return convertDataTable(new ArrayList<>(), 0L); + } + + /** * 转换为TableDataInfo对象 * @@ -50,7 +61,7 @@ public class PageUtils { return tableDataInfo; } - public static Page getPage(){ + public static Page getPage() { PageInfo pageInfo = TableSupport.getPageInfo(); return new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize()); }