smart-flow/ruoyi-vue-pro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YunaiV
2021-01-23 18:35:41 +08:00
parent 1ecbe5aa61
commit aa38c0f9d1
18 changed files with 59 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java
View File

@@ -36,7 +36,7 @@ public class SysPostServiceImpl implements SysPostService {
@Override
public PageResult<SysPostDO> pagePosts(SysPostPageReqVO reqVO) {
return SysPostConvert.INSTANCE.convertPage02(postMapper.selectList(reqVO));
return postMapper.selectPage(reqVO);
}
@Override

2
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
View File

@@ -138,7 +138,7 @@ public class SysDictDataServiceImpl implements SysDictDataService {
@Override
public PageResult<SysDictDataDO> pageDictDatas(SysDictDataPageReqVO reqVO) {
return SysDictDataConvert.INSTANCE.convertPage02(dictDataMapper.selectList(reqVO));
return dictDataMapper.selectPage(reqVO);
}
@Override

23
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java
View File

@@ -12,10 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictType
import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
@@ -28,8 +26,6 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
@Service
public class SysDictTypeServiceImpl implements SysDictTypeService {
@Resource
private SysDictTypeServiceImpl self;
@Resource
private SysDictDataService dictDataService;
@@ -38,7 +34,7 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
@Override
public PageResult<SysDictTypeDO> pageDictTypes(SysDictTypePageReqVO reqVO) {
return SysDictTypeConvert.INSTANCE.convertPage02(dictTypeMapper.selectList(reqVO));
return dictTypeMapper.selectPage(reqVO);
}
@Override
@@ -77,18 +73,6 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
@Override
public void deleteDictType(Long id) {
// 执行删除
self.deleteDictType0(id);
// TODO 发送 MQ 消息
}
@Override
public List<SysDictTypeDO> listDictTypes() {
return dictTypeMapper.selectList();
}
@Transactional
public void deleteDictType0(Long id) {
// 校验是否存在
SysDictTypeDO dictType = this.checkDictTypeExists(id);
// 校验是否有字典数据
@@ -99,6 +83,11 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
dictTypeMapper.deleteById(id);
}
@Override
public List<SysDictTypeDO> listDictTypes() {
return dictTypeMapper.selectList();
}
private void checkCreateOrUpdate(Long id, String name, String type) {
// 校验自己存在
checkDictTypeExists(id);

2
src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java
View File

@@ -28,7 +28,7 @@ public class SysNoticeServiceImpl implements SysNoticeService {
@Override
public PageResult<SysNoticeDO> pageNotices(SysNoticePageReqVO reqVO) {
return SysNoticeConvert.INSTANCE.convertPage02(noticeMapper.selectList(reqVO));
return noticeMapper.selectPage(reqVO);
}
@Override

4
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
View File

@@ -18,7 +18,6 @@ import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum;
import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer;
import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.ImmutableMap;
import lombok.extern.slf4j.Slf4j;
import org.springframework.lang.Nullable;
@@ -201,8 +200,7 @@ public class SysRoleServiceImpl implements SysRoleService {
@Override
public PageResult<SysRoleDO> pageRole(SysRolePageReqVO reqVO) {
IPage<SysRoleDO> roleDOPage = roleMapper.selectPage(reqVO);
return SysRoleConvert.INSTANCE.convertPage(roleDOPage);
return roleMapper.selectPage(reqVO);
}
@Override

3
src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java
View File

@@ -74,8 +74,7 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public PageResult<SysUserDO> pageUsers(SysUserPageReqVO reqVO) {
return SysUserConvert.INSTANCE.convertPage(userMapper.selectList(reqVO,
this.getDeptCondition(reqVO.getDeptId())));
return userMapper.selectPage(reqVO, this.getDeptCondition(reqVO.getDeptId()));
}
@Override