oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. system 提供新的 Resource 相关接口

Browse Source 
2. admin-web 接入新的 Resource 相关接口
This commit is contained in:
YunaiV
2020-04-27 19:48:58 +08:00
parent caf605063c
commit f7157d283c
34 changed files with 684 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java
View File

@@ -1,148 +0,0 @@
package cn.iocoder.mall.admin.service;
import cn.iocoder.common.framework.constant.DeletedStatusEnum;
import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.util.StringUtil;
import cn.iocoder.mall.system.api.ResourceService;
import cn.iocoder.mall.system.api.bo.resource.ResourceBO;
import cn.iocoder.mall.system.api.constant.AdminErrorCodeEnum;
import cn.iocoder.mall.system.api.constant.ResourceConstants;
import cn.iocoder.mall.system.api.dto.resource.ResourceAddDTO;
import cn.iocoder.mall.system.api.dto.resource.ResourceUpdateDTO;
import cn.iocoder.mall.admin.convert.ResourceConvert;
import cn.iocoder.mall.admin.dao.ResourceMapper;
import cn.iocoder.mall.admin.dao.RoleResourceMapper;
import cn.iocoder.mall.admin.dataobject.ResourceDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
@Service
@org.apache.dubbo.config.annotation.Service(validation = "true", version = "${dubbo.provider.ResourceService.version}")
public class ResourceServiceImpl implements ResourceService {
@Autowired
private ResourceMapper resourceMapper;
@Autowired
private RoleResourceMapper roleResourceMapper;
public List<ResourceDO> getResourceListByPermission(String permission) {
List<ResourceDO> resources = resourceMapper.selectListByPermission(permission);
if (resources.isEmpty()) {
return Collections.emptyList();
}
// 因为 ResourceDO 存储的 permissions 是字符串，使用逗号分隔，需要进一步判断
resources.removeIf(resourceDO -> !StringUtil.split(resourceDO.getPermissions(), ",").contains(permission));
return resources;
}
@Override
public List<ResourceBO> getResourcesByTypeAndRoleIds(Integer type, Set<Integer> roleIds) {
if (roleIds == null || roleIds.isEmpty()) {
return Collections.emptyList();
}
return ResourceConvert.INSTANCE.convert(resourceMapper.selectListByTypeAndRoleIds(type, roleIds));
}
@Override
public List<ResourceBO> getResourcesByType(Integer type) {
return ResourceConvert.INSTANCE.convert(resourceMapper.selectListByType (type));
}
@Override
public ResourceBO addResource(Integer adminId, ResourceAddDTO resourceAddDTO) {
// 校验父资源存在
checkParentResource(resourceAddDTO.getPid(), null);
// 存储到数据库
ResourceDO resource = ResourceConvert.INSTANCE.convert(resourceAddDTO);
initResourceProperty(resource);
resource.setCreateTime(new Date());
resource.setDeleted(DeletedStatusEnum.DELETED_NO.getValue());
resourceMapper.insert(resource);
// TODO 操作日志
// 返回成功
return ResourceConvert.INSTANCE.convert(resource);
}
@Override
public Boolean updateResource(Integer adminId, ResourceUpdateDTO resourceUpdateDTO) {
// 校验更新的资源是否存在
if (resourceMapper.selectById(resourceUpdateDTO.getId()) == null) {
throw ServiceExceptionUtil.exception(AdminErrorCodeEnum.RESOURCE_NOT_EXISTS.getCode());
}
// 校验父资源存在
checkParentResource(resourceUpdateDTO.getPid(), resourceUpdateDTO.getId());
// 更新到数据库
ResourceDO resource = ResourceConvert.INSTANCE.convert(resourceUpdateDTO);
initResourceProperty(resource);
resourceMapper.updateById(resource);
// TODO 操作日志
// 返回成功
return true;
}
@Override
@Transactional
public Boolean deleteResource(Integer adminId, Integer resourceId) {
// 校验更新的资源是否存在
if (resourceMapper.selectById(resourceId) == null) {
throw ServiceExceptionUtil.exception(AdminErrorCodeEnum.RESOURCE_NOT_EXISTS.getCode());
}
// 校验是否还有子资源
if (resourceMapper.selectCountByPid(resourceId) > 0) {
throw ServiceExceptionUtil.exception(AdminErrorCodeEnum.RESOURCE_EXISTS_CHILDREN.getCode());
}
// 更新到数据库
resourceMapper.deleteById(resourceId);
// 删除资源关联表
roleResourceMapper.deleteByResourceId(resourceId);
// 返回成功
return true;
}
public List<ResourceDO> getResources(Set<Integer> resourceIds) {
if (resourceIds == null || resourceIds.isEmpty()) {
return Collections.emptyList();
}
return resourceMapper.selectListByIds(resourceIds);
}
private void checkParentResource(Integer pid, Integer childId) {
if (pid == null || ResourceConstants.PID_ROOT.equals(pid)) {
return;
}
if (pid.equals(childId)) { // 不能设置自己为父资源
throw ServiceExceptionUtil.exception(AdminErrorCodeEnum.RESOURCE_PARENT_ERROR.getCode());
}
ResourceDO resource = resourceMapper.selectById(pid);
if (resource == null) { // 父资源不存在
throw ServiceExceptionUtil.exception(AdminErrorCodeEnum.RESOURCE_PARENT_NOT_EXISTS.getCode());
}
if (!ResourceConstants.TYPE_MENU.equals(resource.getType())) { // 父资源必须是菜单类型
throw ServiceExceptionUtil.exception(AdminErrorCodeEnum.RESOURCE_PARENT_NOT_MENU.getCode());
}
}
/**
* 初始化资源的通用属性。
*
* 例如说，只有菜单类型的资源，才设置 icon
*
* @param resource 资源
*/
private void initResourceProperty(ResourceDO resource) {
if (resource.getPid() == null) {
resource.setPid(ResourceConstants.PID_ROOT);
}
if (ResourceConstants.TYPE_BUTTON.equals(resource.getType())) {
resource.setHandler(null);
resource.setIcon(null);
}
}
}

39
system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java
View File

@@ -9,17 +9,8 @@ import cn.iocoder.mall.system.api.bo.role.RoleBO;
import cn.iocoder.mall.system.api.constant.AdminErrorCodeEnum;
import cn.iocoder.mall.system.api.dto.role.RoleAddDTO;
import cn.iocoder.mall.system.api.dto.role.RoleAssignResourceDTO;
import cn.iocoder.mall.system.api.dto.role.RolePageDTO;
import cn.iocoder.mall.system.api.dto.role.RoleUpdateDTO;
import cn.iocoder.mall.admin.convert.RoleConvert;
import cn.iocoder.mall.admin.dao.AdminRoleMapper;
import cn.iocoder.mall.admin.dao.RoleMapper;
import cn.iocoder.mall.admin.dao.RoleResourceMapper;
import cn.iocoder.mall.admin.dataobject.ResourceDO;
import cn.iocoder.mall.admin.dataobject.RoleDO;
import cn.iocoder.mall.admin.dataobject.RoleResourceDO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Maps;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -150,34 +141,4 @@ public class RoleServiceImpl implements RoleService {
return roleMapper.selectBatchIds(roleIds);
}
/**
* 获得权限与角色的映射关系。
*
* TODO 芋艿，等以后有 redis ，优化成从缓存读取。每个 permission ，哪些角色可以访问
*
* @param permissions 权限标识数组
* @return 映射关系。KEY：权限标识；VALUE：角色编号数组
*/
public Map<String, List<Integer>> getPermissionRoleMap(List<String> permissions) {
if (CollectionUtil.isEmpty(permissions)) {
return Collections.emptyMap();
}
Map<String, List<Integer>> result = Maps.newHashMapWithExpectedSize(permissions.size());
for (String permission : permissions) {
List<ResourceDO> resources = resourceService.getResourceListByPermission(permission);
if (resources.isEmpty()) { // 无需授权
result.put(permission, Collections.emptyList());
} else {
List<RoleResourceDO> roleResources = roleResourceMapper.selectListByResourceId(
CollectionUtil.convertSet(resources, ResourceDO::getId));
if (roleResources.isEmpty()) {
result.put(permission, Collections.emptyList());
} else {
result.put(permission, CollectionUtil.convertList(roleResources, RoleResourceDO::getRoleId));
}
}
}
return result;
}
}