From acd69963f35e30b24d7c766e6de03339634bea99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= Date: Tue, 26 Jul 2022 12:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=9F=BA=E4=BA=8ELambda=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/service/impl/BaseServiceImpl.java | 4 ++-- .../main/java/net/maku/system/dao/SysOauthClientDao.java | 4 ++-- .../maku/system/service/impl/SysDictDataServiceImpl.java | 11 ++++++----- .../maku/system/service/impl/SysDictTypeServiceImpl.java | 12 +++++++----- .../net/maku/system/service/impl/SysPostServiceImpl.java | 15 ++++++++------- .../system/service/impl/SysRoleDataScopeServiceImpl.java | 10 +++++++--- .../maku/system/service/impl/SysRoleMenuServiceImpl.java | 9 +++++---- .../net/maku/system/service/impl/SysRoleServiceImpl.java | 11 ++++++----- .../maku/system/service/impl/SysUserPostServiceImpl.java | 9 +++++---- .../maku/system/service/impl/SysUserRoleServiceImpl.java | 12 +++++++----- 10 files changed, 55 insertions(+), 42 deletions(-) diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java b/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java index 626988d..5d9b790 100644 --- a/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java +++ b/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java @@ -1,7 +1,7 @@ package net.maku.framework.common.service.impl; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -99,7 +99,7 @@ public class BaseServiceImpl, T> extends ServiceImpl queryWrapper) { + protected void dataScopeWrapper(LambdaQueryWrapper queryWrapper) { DataScope dataScope = getDataScope(null, null); if (dataScope != null){ queryWrapper.apply(dataScope.getSqlFilter()); diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysOauthClientDao.java b/fast-boot-system/src/main/java/net/maku/system/dao/SysOauthClientDao.java index 3e19167..12ffdd1 100644 --- a/fast-boot-system/src/main/java/net/maku/system/dao/SysOauthClientDao.java +++ b/fast-boot-system/src/main/java/net/maku/system/dao/SysOauthClientDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import net.maku.framework.common.dao.BaseDao; import net.maku.system.entity.SysOauthClientEntity; import org.apache.ibatis.annotations.Mapper; @@ -14,6 +14,6 @@ import org.apache.ibatis.annotations.Mapper; public interface SysOauthClientDao extends BaseDao { default SysOauthClientEntity getByClientId(String clientId){ - return this.selectOne(new QueryWrapper().eq("client_id", clientId)); + return this.selectOne(new LambdaQueryWrapper().eq(SysOauthClientEntity::getClientId, clientId)); } } diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java index 9951976..a483802 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java @@ -1,6 +1,7 @@ package net.maku.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; @@ -32,10 +33,10 @@ public class SysDictDataServiceImpl extends BaseServiceImpl(SysDictDataConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); } - private QueryWrapper getWrapper(SysDictDataQuery query){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("dict_type_id", query.getDictTypeId()); - wrapper.orderByAsc("sort"); + private Wrapper getWrapper(SysDictDataQuery query){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysDictDataEntity::getDictTypeId, query.getDictTypeId()); + wrapper.orderByAsc(SysDictDataEntity::getSort); return wrapper; } diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java index 6e23609..3fe0723 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java @@ -1,6 +1,8 @@ package net.maku.system.service.impl; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -38,11 +40,11 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl(SysDictTypeConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); } - private QueryWrapper getWrapper(SysDictTypeQuery query){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StrUtil.isNotBlank(query.getDictType()), "dict_type", query.getDictType()); - wrapper.like(StrUtil.isNotBlank(query.getDictName()), "dict_name", query.getDictName()); - wrapper.orderByAsc("sort"); + private Wrapper getWrapper(SysDictTypeQuery query){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StrUtil.isNotBlank(query.getDictType()), SysDictTypeEntity::getDictType, query.getDictType()); + wrapper.like(StrUtil.isNotBlank(query.getDictName()), SysDictTypeEntity::getDictName, query.getDictName()); + wrapper.orderByAsc(SysDictTypeEntity::getSort); return wrapper; } diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java index 0033a3b..583101c 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java @@ -1,7 +1,8 @@ package net.maku.system.service.impl; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; @@ -45,12 +46,12 @@ public class SysPostServiceImpl extends BaseServiceImpl getWrapper(SysPostQuery query){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StrUtil.isNotBlank(query.getPostCode()), "post_code", query.getPostCode()); - wrapper.like(StrUtil.isNotBlank(query.getPostName()), "post_name", query.getPostName()); - wrapper.eq(query.getStatus() != null, "status", query.getStatus()); - wrapper.orderByAsc("sort"); + private Wrapper getWrapper(SysPostQuery query){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StrUtil.isNotBlank(query.getPostCode()), SysPostEntity::getPostCode, query.getPostCode()); + wrapper.like(StrUtil.isNotBlank(query.getPostName()), SysPostEntity::getPostName, query.getPostName()); + wrapper.eq(query.getStatus() != null, SysPostEntity::getStatus, query.getStatus()); + wrapper.orderByAsc(SysPostEntity::getSort); return wrapper; } diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java index 5b87c85..f4f3ae2 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java @@ -1,7 +1,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.system.dao.SysRoleDataScopeDao; import net.maku.system.entity.SysRoleDataScopeEntity; @@ -45,7 +45,11 @@ public class SysRoleDataScopeServiceImpl extends BaseServiceImpl deleteOrgIdList = CollUtil.subtract(dbOrgIdList, orgIdList); if (CollUtil.isNotEmpty(deleteOrgIdList)){ - remove(new QueryWrapper().eq("role_id", roleId).in("org_id", deleteOrgIdList)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysRoleDataScopeEntity::getRoleId, roleId); + queryWrapper.in(SysRoleDataScopeEntity::getOrgId, deleteOrgIdList); + + remove(queryWrapper); } } @@ -56,6 +60,6 @@ public class SysRoleDataScopeServiceImpl extends BaseServiceImpl roleIdList) { - remove(new QueryWrapper().in("role_id", roleIdList)); + remove(new LambdaQueryWrapper().in(SysRoleDataScopeEntity::getRoleId, roleIdList)); } } \ No newline at end of file diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java index 090c22f..6a17931 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,7 +1,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.system.dao.SysRoleMenuDao; import net.maku.system.entity.SysRoleMenuEntity; @@ -45,7 +45,8 @@ public class SysRoleMenuServiceImpl extends BaseServiceImpl deleteMenuIdList = CollUtil.subtract(dbMenuIdList, menuIdList); if (CollUtil.isNotEmpty(deleteMenuIdList)){ - remove(new QueryWrapper().eq("role_id", roleId).in("menu_id", deleteMenuIdList)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + remove(queryWrapper.eq(SysRoleMenuEntity::getRoleId, roleId).in(SysRoleMenuEntity::getMenuId, deleteMenuIdList)); } } @@ -57,13 +58,13 @@ public class SysRoleMenuServiceImpl extends BaseServiceImpl roleIdList) { - remove(new QueryWrapper().in("role_id", roleIdList)); + remove(new LambdaQueryWrapper().in(SysRoleMenuEntity::getRoleId, roleIdList)); } @Override @Transactional(rollbackFor = Exception.class) public void deleteByMenuId(Long menuId) { - remove(new QueryWrapper().eq("menu_id", menuId)); + remove(new LambdaQueryWrapper().eq(SysRoleMenuEntity::getMenuId, menuId)); } } \ No newline at end of file diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java index 420e9aa..4430da1 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java @@ -1,7 +1,8 @@ package net.maku.system.service.impl; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import net.maku.framework.common.page.PageResult; @@ -10,11 +11,11 @@ import net.maku.system.convert.SysRoleConvert; import net.maku.system.dao.SysRoleDao; import net.maku.system.entity.SysRoleEntity; import net.maku.system.enums.DataScopeEnum; +import net.maku.system.query.SysRoleQuery; import net.maku.system.service.SysRoleDataScopeService; import net.maku.system.service.SysRoleMenuService; import net.maku.system.service.SysRoleService; import net.maku.system.service.SysUserRoleService; -import net.maku.system.query.SysRoleQuery; import net.maku.system.vo.SysRoleDataScopeVO; import net.maku.system.vo.SysRoleVO; import org.springframework.stereotype.Service; @@ -49,9 +50,9 @@ public class SysRoleServiceImpl extends BaseServiceImpl getWrapper(SysRoleQuery query){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StrUtil.isNotBlank(query.getName()), "name", query.getName()); + private Wrapper getWrapper(SysRoleQuery query){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StrUtil.isNotBlank(query.getName()), SysRoleEntity::getName, query.getName()); // 数据权限 dataScopeWrapper(wrapper); diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java index 0715beb..42b9045 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java @@ -1,7 +1,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.system.dao.SysUserPostDao; import net.maku.system.entity.SysUserPostEntity; @@ -42,18 +42,19 @@ public class SysUserPostServiceImpl extends BaseServiceImpl deletePostIdList = CollUtil.subtract(dbPostIdList, postIdList); if (CollUtil.isNotEmpty(deletePostIdList)){ - remove(new QueryWrapper().eq("user_id", userId).in("post_id", deletePostIdList)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + remove(queryWrapper.eq(SysUserPostEntity::getUserId, userId).in(SysUserPostEntity::getPostId, deletePostIdList)); } } @Override public void deleteByPostIdList(List postIdList) { - remove(new QueryWrapper().in("post_id", postIdList)); + remove(new LambdaQueryWrapper().in(SysUserPostEntity::getPostId, postIdList)); } @Override public void deleteByUserIdList(List userIdList) { - remove(new QueryWrapper().in("user_id", userIdList)); + remove(new LambdaQueryWrapper().in(SysUserPostEntity::getUserId, userIdList)); } @Override diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java index d7dcf18..4d30105 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java +++ b/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java @@ -1,7 +1,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.system.dao.SysUserRoleDao; import net.maku.system.entity.SysUserRoleEntity; @@ -42,7 +42,8 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl deleteRoleIdList = CollUtil.subtract(dbRoleIdList, roleIdList); if (CollUtil.isNotEmpty(deleteRoleIdList)){ - remove(new QueryWrapper().eq("user_id", userId).in("role_id", deleteRoleIdList)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + remove(queryWrapper.eq(SysUserRoleEntity::getUserId, userId).in(SysUserRoleEntity::getRoleId, deleteRoleIdList)); } } @@ -61,17 +62,18 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl roleIdList) { - remove(new QueryWrapper().in("role_id", roleIdList)); + remove(new LambdaQueryWrapper().in(SysUserRoleEntity::getRoleId, roleIdList)); } @Override public void deleteByUserIdList(List userIdList) { - remove(new QueryWrapper().in("user_id", userIdList)); + remove(new LambdaQueryWrapper().in(SysUserRoleEntity::getUserId, userIdList)); } @Override public void deleteByUserIdList(Long roleId, List userIdList) { - remove(new QueryWrapper().eq("role_id", roleId).in("user_id", userIdList)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + remove(queryWrapper.eq(SysUserRoleEntity::getRoleId, roleId).in(SysUserRoleEntity::getUserId, userIdList)); } @Override