From 42521c9b51c1bd9a40036f18fd610cd46601222d Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:45:22 +0800
Subject: [PATCH] #feat .
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 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 4971867..9194cfe 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
@@ -1,11 +1,15 @@
package com.panzhihua.service_user.service.impl;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
@@ -106,19 +110,14 @@
* @return 角色集合
*/
@Override
- public R listRoleBackstage(Long communityId) {
- List<SysRoleDO> sysRoleDOS =
- roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId));
- if (ObjectUtils.isEmpty(sysRoleDOS)) {
- return R.fail("角色列表为空");
+ public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize,String areaCode) {
+ LambdaQueryWrapper<SysRoleDO> queryWrapper=new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId);
+ if(com.panzhihua.common.utlis.StringUtils.isNotEmpty(areaCode)){
+ queryWrapper.eq(SysRoleDO::getAreaCode,areaCode);
}
- List<RoleVO> roleVOS = new ArrayList<>();
- sysRoleDOS.forEach(sysRoleDO -> {
- RoleVO roleVO = new RoleVO();
- BeanUtils.copyProperties(sysRoleDO, roleVO);
- roleVOS.add(roleVO);
- });
- return R.ok(roleVOS);
+ queryWrapper.orderByDesc(SysRoleDO::getCreateAt);
+ IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
+ return R.ok(sysRoleDOIPage);
}
/**
@@ -177,7 +176,13 @@
* @return 菜单集合
*/
@Override
- public R listMenuBackstage(Long communityId) {
+ public R listMenuBackstage(Long communityId,String appId) {
+ if("wx118de8a734d269f0".equals(appId)){
+ communityId=2L;
+ }
+ else {
+ communityId=1552661941170868228L;
+ }
List<SysMenuVO> sysMenuVOS = new ArrayList<>();
List<SysMenuDO> sysMenuDOS =
sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0)
@@ -238,7 +243,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();
@@ -294,13 +299,13 @@
BeanUtils.copyProperties(sysMenuDO2,sysMenuVO2);
sysMenuVOList.add(sysMenuVO2);
});
- sysMenuVO1.setSysMenuVOList(sysMenuVOList);
+ sysMenuVO1.setSysMenuVOList(sysMenuVOList.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
menuVOS.add(sysMenuVO1);
});
- sysMenuVO.setSysMenuVOList(menuVOS);
+ sysMenuVO.setSysMenuVOList(menuVOS.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
sysMenuVOS.add(sysMenuVO);
});
- return R.ok(sysMenuVOS);
+ return R.ok(sysMenuVOS.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
}
/**
@@ -317,7 +322,20 @@
if (!ObjectUtils.isEmpty(sysRoleMenuDOS)) {
List<Long> longs =
sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList());
- return R.ok(longs);
+ List<SysMenuDO> sysMenuDOList=this.sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId,longs).eq(SysMenuDO::getParentId,0));
+ sysMenuDOList.forEach(sysMenuDO -> {
+ List<SysMenuDO> sysMenuDOS=this.sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId,longs).eq(SysMenuDO::getParentId,sysMenuDO.getMenuId()));
+ sysMenuDOS.forEach(sysMenuDO1 -> {
+ List<SysMenuDO> sysMenuDOS1=this.sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId,longs).eq(SysMenuDO::getParentId,sysMenuDO1.getMenuId()));
+ if(!sysMenuDOS1.isEmpty()){
+ longs.remove(sysMenuDO1.getMenuId());
+ }
+ });
+ if(!sysMenuDOS.isEmpty()){
+ longs.remove(sysMenuDO.getMenuId());
+ }
+ });
+ return R.ok(longs);
}
return R.fail();
}
--
Gitblit v1.7.1