BJ_ZTEITS-Developers / parking-cloud-yudao

Commit aa38c0f9d17708e6153d0b9a8141c2cd8ab2072d

Authored by YunaiV
1 parent 1ecbe5aa

优化分页的实现，与 MyBatis Plus 解耦

Inline Side-by-side
Showing 18 changed files with 60 additions and 115 deletions
src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java
  View file @aa38c0f
... ... @@ -3,9 +3,7 @@ package cn.iocoder.dashboard.modules.system.convert.dept;
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*;
5 5 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
6   -import com.baomidou.mybatisplus.core.metadata.IPage;
7 6 import org.mapstruct.Mapper;
8   -import org.mapstruct.Mapping;
9 7 import org.mapstruct.factory.Mappers;
10 8  
11 9 import java.util.List;
... ... @@ -21,9 +19,6 @@ public interface SysPostConvert {
21 19  
22 20 SysPostRespVO convert(SysPostDO id);
23 21  
24   - @Mapping(source = "records", target = "list")
25   - PageResult<SysPostDO> convertPage02(IPage<SysPostDO> page);
26   -
27 22 SysPostDO convert(SysPostCreateReqVO bean);
28 23  
29 24 SysPostDO convert(SysPostUpdateReqVO reqVO);
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
  View file @aa38c0f
... ... @@ -3,9 +3,7 @@ package cn.iocoder.dashboard.modules.system.convert.dict;
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*;
5 5 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
6   -import com.baomidou.mybatisplus.core.metadata.IPage;
7 6 import org.mapstruct.Mapper;
8   -import org.mapstruct.Mapping;
9 7 import org.mapstruct.factory.Mappers;
10 8  
11 9 import java.util.List;
... ... @@ -25,9 +23,6 @@ public interface SysDictDataConvert {
25 23  
26 24 SysDictDataDO convert(SysDictDataCreateReqVO bean);
27 25  
28   - @Mapping(source = "records", target = "list")
29   - PageResult<SysDictDataDO> convertPage02(IPage<SysDictDataDO> page);
30   -
31 26 List<SysDictDataExcelVO> convertList02(List<SysDictDataDO> bean);
32 27  
33 28 }
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java
  View file @aa38c0f
... ... @@ -3,9 +3,7 @@ package cn.iocoder.dashboard.modules.system.convert.dict;
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*;
5 5 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
6   -import com.baomidou.mybatisplus.core.metadata.IPage;
7 6 import org.mapstruct.Mapper;
8   -import org.mapstruct.Mapping;
9 7 import org.mapstruct.factory.Mappers;
10 8  
11 9 import java.util.List;
... ... @@ -19,9 +17,6 @@ public interface SysDictTypeConvert {
19 17  
20 18 SysDictTypeRespVO convert(SysDictTypeDO bean);
21 19  
22   - @Mapping(source = "records", target = "list")
23   - PageResult<SysDictTypeDO> convertPage02(IPage<SysDictTypeDO> page);
24   -
25 20 SysDictTypeDO convert(SysDictTypeCreateReqVO bean);
26 21  
27 22 SysDictTypeDO convert(SysDictTypeUpdateReqVO bean);
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java
  View file @aa38c0f
... ... @@ -5,9 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateR
5 5 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
7 7 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
8   -import com.baomidou.mybatisplus.core.metadata.IPage;
9 8 import org.mapstruct.Mapper;
10   -import org.mapstruct.Mapping;
11 9 import org.mapstruct.factory.Mappers;
12 10  
13 11 @Mapper
... ... @@ -23,7 +21,4 @@ public interface SysNoticeConvert {
23 21  
24 22 SysNoticeDO convert(SysNoticeCreateReqVO bean);
25 23  
26   - @Mapping(source = "records", target = "list")
27   - PageResult<SysNoticeDO> convertPage02(IPage<SysNoticeDO> page);
28   -
29 24 }
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.convert.permission;
2 2  
3   -import cn.iocoder.dashboard.common.pojo.PageResult;
4 3 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*;
5 4 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
6   -import com.baomidou.mybatisplus.core.metadata.IPage;
7 5 import org.mapstruct.Mapper;
8   -import org.mapstruct.Mapping;
9 6 import org.mapstruct.factory.Mappers;
10 7  
11 8 import java.util.List;
... ... @@ -19,9 +16,6 @@ public interface SysRoleConvert {
19 16  
20 17 SysRoleRespVO convert(SysRoleDO bean);
21 18  
22   - @Mapping(source = "records", target = "list")
23   - PageResult<SysRoleDO> convertPage(IPage<SysRoleDO> page);
24   -
25 19 SysRoleDO convert(SysRoleCreateReqVO bean);
26 20  
27 21 List<SysRoleSimpleRespVO> convertList02(List<SysRoleDO> list);
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.convert.user;
2 2  
3   -import cn.iocoder.dashboard.common.pojo.PageResult;
4 3 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*;
5 4 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
6 5 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
7   -import com.baomidou.mybatisplus.core.metadata.IPage;
8 6 import org.mapstruct.Mapper;
9   -import org.mapstruct.Mapping;
10 7 import org.mapstruct.factory.Mappers;
11 8  
12 9 @Mapper
... ... @@ -18,9 +15,6 @@ public interface SysUserConvert {
18 15  
19 16 SysUserPageItemRespVO.Dept convert(SysDeptDO bean);
20 17  
21   - @Mapping(source = "records", target = "list")
22   - PageResult<SysUserDO> convertPage(IPage<SysUserDO> page);
23   -
24 18 SysUserDO convert(SysUserCreateReqVO bean);
25 19  
26 20 SysUserDO convert(SysUserUpdateReqVO bean);
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dept/SysPostMapper.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept;
2 2  
  3 +import cn.iocoder.dashboard.common.pojo.PageResult;
  4 +import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
3 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
4   -import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
5 6 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO;
6 7 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO;
7 8 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
8 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
10   -import com.baomidou.mybatisplus.core.metadata.IPage;
11 10 import org.apache.ibatis.annotations.Mapper;
12 11  
13 12 import java.util.Collection;
14 13 import java.util.List;
15 14  
16 15 @Mapper
17   -public interface SysPostMapper extends BaseMapper<SysPostDO> {
  16 +public interface SysPostMapper extends BaseMapperX<SysPostDO> {
18 17  
19 18 default List<SysPostDO> selectList(Collection<Long> ids, Collection<Integer> statuses) {
20 19 return selectList(new QueryWrapperX<SysPostDO>().inIfPresent("id", ids)
21 20 .inIfPresent("status", statuses));
22 21 }
23 22  
24   - default IPage<SysPostDO> selectList(SysPostPageReqVO reqVO) {
25   - return selectPage(MyBatisUtils.buildPage(reqVO),
26   - new QueryWrapperX<SysPostDO>().likeIfPresent("name", reqVO.getName())
27   - .eqIfPresent("status", reqVO.getStatus()));
  23 + default PageResult<SysPostDO> selectPage(SysPostPageReqVO reqVO) {
  24 + return selectPage(reqVO, new QueryWrapperX<SysPostDO>()
  25 + .likeIfPresent("name", reqVO.getName())
  26 + .eqIfPresent("status", reqVO.getStatus()));
28 27 }
29 28  
30 29 default List<SysPostDO> selectList(SysPostExportReqVO reqVO) {
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictDataMapper.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
2 2  
  3 +import cn.iocoder.dashboard.common.pojo.PageResult;
  4 +import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
3 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
4   -import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
5 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO;
6 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
7 8 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
8 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
10   -import com.baomidou.mybatisplus.core.metadata.IPage;
11 10 import org.apache.ibatis.annotations.Mapper;
12 11  
13 12 import java.util.Date;
14 13 import java.util.List;
15 14  
16   -import static com.baomidou.mybatisplus.core.metadata.OrderItem.asc;
17   -
18 15 @Mapper
19   -public interface SysDictDataMapper extends BaseMapper<SysDictDataDO> {
  16 +public interface SysDictDataMapper extends BaseMapperX<SysDictDataDO> {
20 17  
21 18 default SysDictDataDO selectByLabel(String label) {
22 19 return selectOne(new QueryWrapper<SysDictDataDO>().eq("label", label));
... ... @@ -26,12 +23,12 @@ public interface SysDictDataMapper extends BaseMapper&lt;SysDictDataDO&gt; {
26 23 return selectCount(new QueryWrapper<SysDictDataDO>().eq("dict_type", dictType));
27 24 }
28 25  
29   - default IPage<SysDictDataDO> selectList(SysDictDataPageReqVO reqVO) {
30   - return selectPage(MyBatisUtils.buildPage(reqVO),
31   - new QueryWrapperX<SysDictDataDO>().likeIfPresent("label", reqVO.getLabel())
32   - .likeIfPresent("dict_type", reqVO.getDictType())
33   - .eqIfPresent("status", reqVO.getStatus()))
34   - .addOrder(asc("dict_type"), asc("sort"));
  26 + default PageResult<SysDictDataDO> selectPage(SysDictDataPageReqVO reqVO) {
  27 + return selectPage(reqVO, new QueryWrapperX<SysDictDataDO>()
  28 + .likeIfPresent("label", reqVO.getLabel())
  29 + .likeIfPresent("dict_type", reqVO.getDictType())
  30 + .eqIfPresent("status", reqVO.getStatus())
  31 + .orderByAsc("dict_type", "sort"));
35 32 }
36 33  
37 34 default List<SysDictDataDO> selectList() {
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictTypeMapper.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
2 2  
  3 +import cn.iocoder.dashboard.common.pojo.PageResult;
  4 +import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
3 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
4   -import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
5 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO;
6 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
7 8 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
8 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
10   -import com.baomidou.mybatisplus.core.metadata.IPage;
11 10 import org.apache.ibatis.annotations.Mapper;
12 11  
13 12 import java.util.List;
14 13  
15 14 @Mapper
16   -public interface SysDictTypeMapper extends BaseMapper<SysDictTypeDO> {
17   -
18   - default IPage<SysDictTypeDO> selectList(SysDictTypePageReqVO reqVO) {
19   - return selectPage(MyBatisUtils.buildPage(reqVO),
20   - new QueryWrapperX<SysDictTypeDO>().likeIfPresent("name", reqVO.getName())
21   - .likeIfPresent("dict_type", reqVO.getType())
22   - .eqIfPresent("status", reqVO.getStatus())
23   - .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime()));
  15 +public interface SysDictTypeMapper extends BaseMapperX<SysDictTypeDO> {
  16 +
  17 + default PageResult<SysDictTypeDO> selectPage(SysDictTypePageReqVO reqVO) {
  18 + return selectPage(reqVO, new QueryWrapperX<SysDictTypeDO>()
  19 + .likeIfPresent("name", reqVO.getName())
  20 + .likeIfPresent("dict_type", reqVO.getType())
  21 + .eqIfPresent("status", reqVO.getStatus())
  22 + .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime()));
24 23 }
25 24  
26 25 default List<SysDictTypeDO> selectList(SysDictTypeExportReqVO reqVO) {
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/notice/SysNoticeMapper.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.notice;
2 2  
  3 +import cn.iocoder.dashboard.common.pojo.PageResult;
  4 +import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
3 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
4   -import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
5 6 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
6 7 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
7   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8   -import com.baomidou.mybatisplus.core.metadata.IPage;
9 8 import org.apache.ibatis.annotations.Mapper;
10 9  
11 10 @Mapper
12   -public interface SysNoticeMapper extends BaseMapper<SysNoticeDO> {
  11 +public interface SysNoticeMapper extends BaseMapperX<SysNoticeDO> {
13 12  
14   - default IPage<SysNoticeDO> selectList(SysNoticePageReqVO reqVO) {
15   - return selectPage(MyBatisUtils.buildPage(reqVO),
16   - new QueryWrapperX<SysNoticeDO>().likeIfPresent("title", reqVO.getTitle())
17   - .eqIfPresent("status", reqVO.getStatus()));
  13 + default PageResult<SysNoticeDO> selectPage(SysNoticePageReqVO reqVO) {
  14 + return selectPage(reqVO, new QueryWrapperX<SysNoticeDO>()
  15 + .likeIfPresent("title", reqVO.getTitle())
  16 + .eqIfPresent("status", reqVO.getStatus()));
18 17 }
19 18  
20 19 }
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysRoleMapper.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
2 2  
  3 +import cn.iocoder.dashboard.common.pojo.PageResult;
3 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
4 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
5   -import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
6 6 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO;
8 8 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
9 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10   -import com.baomidou.mybatisplus.core.metadata.IPage;
11 10 import org.apache.ibatis.annotations.Mapper;
12 11 import org.springframework.lang.Nullable;
13 12  
... ... @@ -18,12 +17,11 @@ import java.util.List;
18 17 @Mapper
19 18 public interface SysRoleMapper extends BaseMapperX<SysRoleDO> {
20 19  
21   - default IPage<SysRoleDO> selectPage(SysRolePageReqVO reqVO) {
22   - return selectPage(MyBatisUtils.buildPage(reqVO),
23   - new QueryWrapperX<SysRoleDO>().likeIfPresent("name", reqVO.getName())
24   - .likeIfPresent("code", reqVO.getCode())
25   - .eqIfPresent("status", reqVO.getStatus())
26   - .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime()));
  20 + default PageResult<SysRoleDO> selectPage(SysRolePageReqVO reqVO) {
  21 + return selectPage(reqVO, new QueryWrapperX<SysRoleDO>().likeIfPresent("name", reqVO.getName())
  22 + .likeIfPresent("code", reqVO.getCode())
  23 + .eqIfPresent("status", reqVO.getStatus())
  24 + .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime()));
27 25 }
28 26  
29 27 default List<SysRoleDO> listRoles(SysRoleExportReqVO reqVO) {
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/user/SysUserMapper.java
  View file @aa38c0f
1 1 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.user;
2 2  
  3 +import cn.iocoder.dashboard.common.pojo.PageResult;
  4 +import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
3 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
4   -import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
5 6 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserExportReqVO;
6 7 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO;
7 8 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
8 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
10   -import com.baomidou.mybatisplus.core.metadata.IPage;
11 10 import org.apache.ibatis.annotations.Mapper;
12 11  
13 12 import java.util.Collection;
14 13 import java.util.List;
15 14  
16 15 @Mapper
17   -public interface SysUserMapper extends BaseMapper<SysUserDO> {
  16 +public interface SysUserMapper extends BaseMapperX<SysUserDO> {
18 17  
19 18 default SysUserDO selectByUsername(String username) {
20 19 return selectOne(new QueryWrapper<SysUserDO>().eq("username", username));
... ... @@ -28,13 +27,13 @@ public interface SysUserMapper extends BaseMapper&lt;SysUserDO&gt; {
28 27 return selectOne(new QueryWrapper<SysUserDO>().eq("email", email));
29 28 }
30 29  
31   - default IPage<SysUserDO> selectList(SysUserPageReqVO reqVO, Collection<Long> deptIds) {
32   - return selectPage(MyBatisUtils.buildPage(reqVO),
33   - new QueryWrapperX<SysUserDO>().likeIfPresent("username", reqVO.getUsername())
34   - .likeIfPresent("mobile", reqVO.getMobile())
35   - .eqIfPresent("status", reqVO.getStatus())
36   - .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime())
37   - .inIfPresent("dept_id", deptIds));
  30 + default PageResult<SysUserDO> selectPage(SysUserPageReqVO reqVO, Collection<Long> deptIds) {
  31 + return selectPage(reqVO, new QueryWrapperX<SysUserDO>()
  32 + .likeIfPresent("username", reqVO.getUsername())
  33 + .likeIfPresent("mobile", reqVO.getMobile())
  34 + .eqIfPresent("status", reqVO.getStatus())
  35 + .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime())
  36 + .inIfPresent("dept_id", deptIds));
38 37 }
39 38  
40 39 default List<SysUserDO> selectList(SysUserExportReqVO reqVO, Collection<Long> deptIds) {
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java
  View file @aa38c0f
... ... @@ -36,7 +36,7 @@ public class SysPostServiceImpl implements SysPostService {
36 36  
37 37 @Override
38 38 public PageResult<SysPostDO> pagePosts(SysPostPageReqVO reqVO) {
39   - return SysPostConvert.INSTANCE.convertPage02(postMapper.selectList(reqVO));
  39 + return postMapper.selectPage(reqVO);
40 40 }
41 41  
42 42 @Override
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
  View file @aa38c0f
... ... @@ -138,7 +138,7 @@ public class SysDictDataServiceImpl implements SysDictDataService {
138 138  
139 139 @Override
140 140 public PageResult<SysDictDataDO> pageDictDatas(SysDictDataPageReqVO reqVO) {
141   - return SysDictDataConvert.INSTANCE.convertPage02(dictDataMapper.selectList(reqVO));
  141 + return dictDataMapper.selectPage(reqVO);
142 142 }
143 143  
144 144 @Override
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java
  View file @aa38c0f
... ... @@ -12,10 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictType
12 12 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
13 13 import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
14 14 import org.springframework.stereotype.Service;
15   -import org.springframework.transaction.annotation.Transactional;
16 15  
17 16 import javax.annotation.Resource;
18   -
19 17 import java.util.List;
20 18  
21 19 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
... ... @@ -29,8 +27,6 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
29 27 public class SysDictTypeServiceImpl implements SysDictTypeService {
30 28  
31 29 @Resource
32   - private SysDictTypeServiceImpl self;
33   - @Resource
34 30 private SysDictDataService dictDataService;
35 31  
36 32 @Resource
... ... @@ -38,7 +34,7 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
38 34  
39 35 @Override
40 36 public PageResult<SysDictTypeDO> pageDictTypes(SysDictTypePageReqVO reqVO) {
41   - return SysDictTypeConvert.INSTANCE.convertPage02(dictTypeMapper.selectList(reqVO));
  37 + return dictTypeMapper.selectPage(reqVO);
42 38 }
43 39  
44 40 @Override
... ... @@ -77,18 +73,6 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
77 73  
78 74 @Override
79 75 public void deleteDictType(Long id) {
80   - // 执行删除
81   - self.deleteDictType0(id);
82   - // TODO 发送 MQ 消息
83   - }
84   -
85   - @Override
86   - public List<SysDictTypeDO> listDictTypes() {
87   - return dictTypeMapper.selectList();
88   - }
89   -
90   - @Transactional
91   - public void deleteDictType0(Long id) {
92 76 // 校验是否存在
93 77 SysDictTypeDO dictType = this.checkDictTypeExists(id);
94 78 // 校验是否有字典数据
... ... @@ -99,6 +83,11 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
99 83 dictTypeMapper.deleteById(id);
100 84 }
101 85  
  86 + @Override
  87 + public List<SysDictTypeDO> listDictTypes() {
  88 + return dictTypeMapper.selectList();
  89 + }
  90 +
102 91 private void checkCreateOrUpdate(Long id, String name, String type) {
103 92 // 校验自己存在
104 93 checkDictTypeExists(id);
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java
  View file @aa38c0f
... ... @@ -28,7 +28,7 @@ public class SysNoticeServiceImpl implements SysNoticeService {
28 28  
29 29 @Override
30 30 public PageResult<SysNoticeDO> pageNotices(SysNoticePageReqVO reqVO) {
31   - return SysNoticeConvert.INSTANCE.convertPage02(noticeMapper.selectList(reqVO));
  31 + return noticeMapper.selectPage(reqVO);
32 32 }
33 33  
34 34 @Override
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
  View file @aa38c0f
... ... @@ -18,7 +18,6 @@ import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum;
18 18 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer;
19 19 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
20 20 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
21   -import com.baomidou.mybatisplus.core.metadata.IPage;
22 21 import com.google.common.collect.ImmutableMap;
23 22 import lombok.extern.slf4j.Slf4j;
24 23 import org.springframework.lang.Nullable;
... ... @@ -201,8 +200,7 @@ public class SysRoleServiceImpl implements SysRoleService {
201 200  
202 201 @Override
203 202 public PageResult<SysRoleDO> pageRole(SysRolePageReqVO reqVO) {
204   - IPage<SysRoleDO> roleDOPage = roleMapper.selectPage(reqVO);
205   - return SysRoleConvert.INSTANCE.convertPage(roleDOPage);
  203 + return roleMapper.selectPage(reqVO);
206 204 }
207 205  
208 206 @Override
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java
  View file @aa38c0f
... ... @@ -74,8 +74,7 @@ public class SysUserServiceImpl implements SysUserService {
74 74  
75 75 @Override
76 76 public PageResult<SysUserDO> pageUsers(SysUserPageReqVO reqVO) {
77   - return SysUserConvert.INSTANCE.convertPage(userMapper.selectList(reqVO,
78   - this.getDeptCondition(reqVO.getDeptId())));
  77 + return userMapper.selectPage(reqVO, this.getDeptCondition(reqVO.getDeptId()));
79 78 }
80 79  
81 80 @Override
... ...