public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-11 15:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 增加权限设置

Browse Source
This commit is contained in:
fit2cloud-chenyw
2021-03-05 16:07:44 +08:00
parent a60a243114
commit a647c66b8a
20 changed files with 151 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java
View File

@@ -12,4 +12,6 @@ import java.util.List;
public class CurrentUserDto extends SysUserEntity implements Serializable {
private List<CurrentRoleDto> roles;
private List<String> permissions;
}

2
backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java
View File

@@ -23,6 +23,8 @@ public class DynamicMenuDto implements Serializable {
private Long id;
private String permission;
private List<DynamicMenuDto> children;
}

3
backend/src/main/java/io/dataease/auth/server/AuthServer.java
View File

@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -59,7 +58,9 @@ public class AuthServer implements AuthApi {
SysUserEntity user = authUserService.getUser(username);
CurrentUserDto currentUserDto = BeanUtils.copyBean(new CurrentUserDto(), user);
List<CurrentRoleDto> currentRoleDtos = authUserService.roleInfos(user.getUserId());
List<String> permissions = authUserService.permissions(user.getUserId());
currentUserDto.setRoles(currentRoleDtos);
currentUserDto.setPermissions(permissions);
return currentUserDto;
}

5
backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java
View File

@@ -4,11 +4,13 @@ import io.dataease.auth.api.dto.CurrentRoleDto;
import io.dataease.auth.entity.SysUserEntity;
import io.dataease.base.mapper.ext.AuthMapper;
import io.dataease.auth.service.AuthUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
public class AuthUserServiceImpl implements AuthUserService {
@@ -27,7 +29,8 @@ public class AuthUserServiceImpl implements AuthUserService {
}
@Override
public List<String> permissions(Long userId){
return authMapper.permissions(userId);
List<String> permissions = authMapper.permissions(userId);
return permissions.stream().filter(StringUtils::isNotEmpty).collect(Collectors.toList());
}
@Override

2
backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java
View File

@@ -21,6 +21,7 @@ public class DynamicMenuServiceImpl implements DynamicMenuService {
@Override
public List<DynamicMenuDto> load(String userId) {
SysMenuExample sysMenuExample = new SysMenuExample();
sysMenuExample.createCriteria().andTypeLessThanOrEqualTo(1);
sysMenuExample.setOrderByClause(" menu_sort ");
List<SysMenu> sysMenus = sysMenuMapper.selectByExample(sysMenuExample);
List<DynamicMenuDto> dynamicMenuDtos = sysMenus.stream().map(this::convert).collect(Collectors.toList());
@@ -40,6 +41,7 @@ public class DynamicMenuServiceImpl implements DynamicMenuService {
menuMeta.setTitle(sysMenu.getTitle());
menuMeta.setIcon(sysMenu.getIcon());
dynamicMenuDto.setMeta(menuMeta);
dynamicMenuDto.setPermission(sysMenu.getPermission());
return dynamicMenuDto;
}