From bfc6e3a58a707abbb1aa2d8bd495f5d9698bd442 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 82 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
index cd6ef70..18fe43f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -6,6 +6,8 @@
import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -30,6 +32,7 @@
import com.panzhihua.service_user.service.RoleService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -105,19 +108,12 @@
* @return 角色集合
*/
@Override
- public R listRoleBackstage(Long communityId) {
- List<SysRoleDO> sysRoleDOS =
- roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId));
- if (ObjectUtils.isEmpty(sysRoleDOS)) {
+ public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize) {
+ IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId).orderByDesc(SysRoleDO::getCreateAt));
+ if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
return R.fail("角色列表为空");
}
- List<RoleVO> roleVOS = new ArrayList<>();
- sysRoleDOS.forEach(sysRoleDO -> {
- RoleVO roleVO = new RoleVO();
- BeanUtils.copyProperties(sysRoleDO, roleVO);
- roleVOS.add(roleVO);
- });
- return R.ok(roleVOS);
+ return R.ok(sysRoleDOIPage);
}
/**
@@ -137,9 +133,7 @@
} catch (Exception e) {
e.printStackTrace();
log.error("新增角色失败，失败原因【{}】", e.getMessage());
- if (e.getMessage().contains("unique_role_name_community_id")) {
return R.fail("角色已经存在");
- }
}
if (insert > 0) {
SysRoleDO roleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda()
@@ -195,6 +189,15 @@
sysMenuDOS1.forEach(sysMenuDO1 -> {
SysMenuVO sysMenuVO1 = new SysMenuVO();
BeanUtils.copyProperties(sysMenuDO1, sysMenuVO1);
+ List<SysMenuDO> sysMenuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda()
+ .eq(SysMenuDO::getParentId, sysMenuDO1.getMenuId()).orderByAsc(SysMenuDO::getOrderNum));
+ List<SysMenuVO> sysMenuVOList=new ArrayList<>();
+ sysMenuDOList.forEach(sysMenuDO2 -> {
+ SysMenuVO sysMenuVO2=new SysMenuVO();
+ BeanUtils.copyProperties(sysMenuDO2,sysMenuVO2);
+ sysMenuVOList.add(sysMenuVO2);
+ });
+ sysMenuVO1.setSysMenuVOList(sysMenuVOList);
sysMenuVOS1.add(sysMenuVO1);
});
sysMenuVO.setSysMenuVOList(sysMenuVOS1);
@@ -217,6 +220,12 @@
public R putMenuRole(MenuRoleVO menuRoleVO) {
List<Long> menuIds = new ArrayList<>();
Long roleId = menuRoleVO.getRoleId();
+ if(!StringUtils.isEmpty(menuRoleVO.getRoleName())){
+ SysRoleDO sysRoleDO=new SysRoleDO();
+ sysRoleDO.setRoleId(roleId);
+ sysRoleDO.setRoleName(menuRoleVO.getRoleName());
+ this.roleDAO.updateById(sysRoleDO);
+ }
// 删除旧的
sysRoleMenuDAO.delete(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId));
// 创建新的
@@ -224,7 +233,7 @@
if (isAll.intValue() == 1) {
menuIds = sysMenuDAO
.selectList(
- new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, menuRoleVO.getCommunityId()))
+ new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2))
.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
} else {
menuIds = menuRoleVO.getMenuIds();
@@ -263,26 +272,30 @@
List<Long> collect =
sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList());
List<SysMenuDO> sysMenuDOS =
- sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, collect));
+ sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, collect).eq(SysMenuDO::getParentId,0));
List<SysMenuVO> sysMenuVOS = new ArrayList<>();
sysMenuDOS.forEach(sysMenuDO -> {
SysMenuVO sysMenuVO = new SysMenuVO();
+ List<SysMenuVO> menuVOS=new ArrayList<>();
BeanUtils.copyProperties(sysMenuDO, sysMenuVO);
+ List<SysMenuDO> sysMenuDOList=sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId,sysMenuDO.getMenuId()).in(SysMenuDO::getMenuId, collect));
+ sysMenuDOList.forEach(sysMenuDO1->{
+ SysMenuVO sysMenuVO1 = new SysMenuVO();
+ List<SysMenuVO> sysMenuVOList=new ArrayList<>();
+ BeanUtils.copyProperties(sysMenuDO1, sysMenuVO1);
+ List<SysMenuDO> sysMenuDOList1=sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId,sysMenuDO1.getMenuId()).in(SysMenuDO::getMenuId, collect));
+ sysMenuDOList1.forEach(sysMenuDO2 -> {
+ SysMenuVO sysMenuVO2=new SysMenuVO();
+ BeanUtils.copyProperties(sysMenuDO2,sysMenuVO2);
+ sysMenuVOList.add(sysMenuVO2);
+ });
+ sysMenuVO1.setSysMenuVOList(sysMenuVOList);
+ menuVOS.add(sysMenuVO1);
+ });
+ sysMenuVO.setSysMenuVOList(menuVOS);
sysMenuVOS.add(sysMenuVO);
});
- List<SysMenuVO> collect1 =
- sysMenuVOS.stream().filter(sysMenuVO -> sysMenuVO.getParentId() == 0).collect(Collectors.toList());
- if (!ObjectUtils.isEmpty(collect1)) {
- collect1.forEach(sysMenuVO -> {
- Long menuId = sysMenuVO.getMenuId();
- List<SysMenuVO> sysMenuVOS1 =
- sysMenuVOS.stream().filter(sysMenuVO1 -> sysMenuVO1.getParentId().intValue() == menuId.intValue())
- .collect(Collectors.toList());
- sysMenuVO.setSysMenuVOList(sysMenuVOS1);
- });
- }
-
- return R.ok(collect1);
+ return R.ok(sysMenuVOS);
}
/**
@@ -294,22 +307,13 @@
*/
@Override
public R listMenuBackstageByRole(Long roleId) {
- List<SysMenuVO> sysMenuVOS = new ArrayList<>();
List<SysRoleMenuDO> sysRoleMenuDOS =
sysRoleMenuDAO.selectList(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId));
if (!ObjectUtils.isEmpty(sysRoleMenuDOS)) {
List<Long> longs =
sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList());
- List<SysMenuDO> sysMenuDOS =
- sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, longs));
- if (!ObjectUtils.isEmpty(sysMenuDOS)) {
- sysMenuDOS.forEach(sysMenuDO -> {
- SysMenuVO sysMenuVO1 = new SysMenuVO();
- BeanUtils.copyProperties(sysMenuDO, sysMenuVO1);
- sysMenuVOS.add(sysMenuVO1);
- });
- }
+ return R.ok(longs);
}
- return R.ok(sysMenuVOS);
+ return R.fail();
}
}
--
Gitblit v1.7.1