Skip to content

T
TDLCloud
Commit 1fa8df64 authored by chenying's avatar chenying
Browse files
Options

6.13修改权限接口

parent ee4e5dbe
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 66 deletions
src/main/java/com/example/tdl/domain/vo/SideAndPermissionVo.java
View file @ 1fa8df64
......@@ -5,7 +5,7 @@ import java.util.List;
public class SideAndPermissionVo {
private String sideTitle;
private List<PermissionGroupVo> permissionGroupVos;
private List<PermissionShowVo> permissionShowVos;
public String getSideTitle() {
return sideTitle;
......@@ -15,11 +15,11 @@ public class SideAndPermissionVo {
this.sideTitle = sideTitle;
}
public List<PermissionGroupVo> getPermissionGroupVos() {
return permissionGroupVos;
public List<PermissionShowVo> getPermissionShowVos() {
return permissionShowVos;
}
public void setPermissionGroupVos(List<PermissionGroupVo> permissionGroupVos) {
this.permissionGroupVos = permissionGroupVos;
public void setPermissionShowVos(List<PermissionShowVo> permissionShowVos) {
this.permissionShowVos = permissionShowVos;
}
}
src/main/java/com/example/tdl/web/PermissionController.java
View file @ 1fa8df64
......@@ -66,50 +66,69 @@ public class PermissionController {
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
List<SideGroupVo> sideGroupVos=new ArrayList<>();
//获取该公司的所有权限
String name = "管理员";
// List<String> parentSideLists=sideService.getSideTitleParentName();
//
// for (String parentSideName: parentSideLists){
// List<String> sideTitles = sideService.getSideTitleByParentName(parentSideName);
// SideGroupVo sideGroupVo = new SideGroupVo();
// List<SideAndPermissionVo> sideAndPermissionVos = new ArrayList<>();
// for(String sideName:sideTitles){
// SideAndPermissionVo sideAndPermissionVo =new SideAndPermissionVo();
// sideAndPermissionVo.setSideTitle(sideName);
// sideAndPermissionVos.add(sideAndPermissionVo);
// String permissionName=sideService.getParentPermissionBySideTitle(sideName);
// }
// sideGroupVo.setParentSide(parentSideName);
// sideGroupVo.setSideAndPermissionVos(sideAndPermissionVos);
// sideGroupVos.add(sideGroupVo);
// }
List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyName());
List<String> parentLists =permissionService.getPermissionParentName();
List<PermissionGroupVo> vo =new ArrayList<>();
//遍历取出每一个action匹配权限组
for (String parentName: parentLists){
List<String> permissions = permissionService.getPermissionByPermissionName(parentName);
PermissionGroupVo permissionNameGroupVo = new PermissionGroupVo();
//获取所有父侧边栏的名字
List<String> parentSideLists=sideService.getSideTitleParentName();
List<SideGroupVo> sideGroupVos=new ArrayList<>();
for (String parentSideName: parentSideLists){
SideGroupVo sideGroupVo = new SideGroupVo();
//获取子侧边栏的名字
List<String> sideTitles = sideService.getSideTitleByParentName(parentSideName);
List<SideAndPermissionVo> sideAndPermissionVos = new ArrayList<>();
for(String sideName:sideTitles){
SideAndPermissionVo sideAndPermissionVo =new SideAndPermissionVo();
//获取侧边栏对应的父权限名
String permissionName=sideService.getParentPermissionBySideTitle(sideName);
PermissionGroupVo permissionGroupVo=new PermissionGroupVo();
permissionGroupVo.setParentName(permissionName);
//获取父权限对应的子权限
List<String> permissionNames=permissionService.getPermissionByPermissionName(permissionName);
List<PermissionShowVo> permissionShowVoList = new ArrayList<>();
for(String permissionName:permissions){
if(permissionLists.contains(permissionName)){
PermissionShowVo permissionShowVo =new PermissionShowVo();
permissionShowVo.setPermissionName(permissionName);
for (String permissionName1:permissionNames){
if(permissionLists.contains(permissionName1)) {
PermissionShowVo permissionShowVo = new PermissionShowVo();
permissionShowVo.setPermissionName(permissionName1);
permissionShowVo.setChecked(false);
permissionShowVoList.add(permissionShowVo);
permissionNameGroupVo.setParentName(parentName);
}
}
permissionNameGroupVo.setPermissionShowVoList(permissionShowVoList);
if(permissionShowVoList.size() >0){
vo.add(permissionNameGroupVo);
sideAndPermissionVo.setSideTitle(sideName);
sideAndPermissionVo.setPermissionShowVos(permissionShowVoList);
sideAndPermissionVos.add(sideAndPermissionVo);
}
}
return vo;
// return sideGroupVos;
if(sideAndPermissionVos.size() >0){
sideGroupVo.setParentSide(parentSideName);
sideGroupVo.setSideAndPermissionVos(sideAndPermissionVos);
sideGroupVos.add(sideGroupVo);
}
}
// List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyName());
// List<String> parentLists =permissionService.getPermissionParentName();
// List<PermissionGroupVo> vo =new ArrayList<>();
// //遍历取出每一个action匹配权限组
// for (String parentName: parentLists){
// List<String> permissions = permissionService.getPermissionByPermissionName(parentName);
// PermissionGroupVo permissionNameGroupVo = new PermissionGroupVo();
// List<PermissionShowVo> permissionShowVoList = new ArrayList<>();
// for(String permissionName:permissions){
// if(permissionLists.contains(permissionName)){
// PermissionShowVo permissionShowVo =new PermissionShowVo();
// permissionShowVo.setPermissionName(permissionName);
// permissionShowVo.setChecked(false);
// permissionShowVoList.add(permissionShowVo);
// permissionNameGroupVo.setParentName(parentName);
// }
// }
// permissionNameGroupVo.setPermissionShowVoList(permissionShowVoList);
// if(permissionShowVoList.size() >0){
// vo.add(permissionNameGroupVo);
// }
// }
// return vo;
return sideGroupVos;
}
......@@ -131,36 +150,75 @@ public class PermissionController {
JSONObject json = JSON.parseObject(roleName);
roleName= (String) json.get("roleName");
//获取该公司的所有权限
String name = "系统管理员";
String name = "管理员";
List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyName());
List<String> parentLists =permissionService.getPermissionParentName();
//根据角色名获取拥有的角色
List<String> rolePermission = roleHasPermissionService.getByRoleName(roleName,user.getCompanyName());
List<PermissionGroupVo> vo =new ArrayList<>();
//遍历取出每一个action匹配权限组
for (String parentName : parentLists) {
List<String> permissions = permissionService.getPermissionByPermissionName(parentName);
PermissionGroupVo permissionGroupVo = new PermissionGroupVo();
permissionGroupVo.setParentName(parentName);
List<PermissionShowVo> permissionShowVosList = new ArrayList<>();
for (String permission : permissions) {
//获取父侧边栏的名字
List<String> parentSideLists=sideService.getSideTitleParentName();
List<SideGroupVo> sideGroupVos=new ArrayList<>();
for (String parentSideName: parentSideLists){
SideGroupVo sideGroupVo = new SideGroupVo();
//获取子侧边栏的名字
List<String> sideTitles = sideService.getSideTitleByParentName(parentSideName);
List<SideAndPermissionVo> sideAndPermissionVos = new ArrayList<>();
for(String sideName:sideTitles){
SideAndPermissionVo sideAndPermissionVo =new SideAndPermissionVo();
//获取侧边栏对应的父权限名
String permissionName=sideService.getParentPermissionBySideTitle(sideName);
PermissionGroupVo permissionGroupVo=new PermissionGroupVo();
permissionGroupVo.setParentName(permissionName);
//获取父权限对应的子权限
List<String> permissionNames=permissionService.getPermissionByPermissionName(permissionName);
List<PermissionShowVo> permissionShowVoList = new ArrayList<>();
for (String permissionName1:permissionNames){
if(permissionLists.contains(permissionName1)) {
PermissionShowVo permissionShowVo = new PermissionShowVo();
if (permissionLists.contains(permission)) {
permissionShowVo.setPermissionName(permission);
if (rolePermission.contains(permission)) {
permissionShowVo.setPermissionName(permissionName1);
if (rolePermission.contains(permissionName1)) {
permissionShowVo.setChecked(true);
} else {
permissionShowVo.setChecked(false);
}
permissionShowVosList.add(permissionShowVo);
permissionShowVoList.add(permissionShowVo);
}
}
if (permissionShowVoList.size() > 0) {
sideAndPermissionVo.setSideTitle(sideName);
sideAndPermissionVo.setPermissionShowVos(permissionShowVoList);
sideAndPermissionVos.add(sideAndPermissionVo);
}
}
permissionGroupVo.setPermissionShowVoList(permissionShowVosList);
if (permissionShowVosList.size() > 0) {
vo.add(permissionGroupVo);
if (sideAndPermissionVos.size() > 0) {
sideGroupVo.setParentSide(parentSideName);
sideGroupVo.setSideAndPermissionVos(sideAndPermissionVos);
sideGroupVos.add(sideGroupVo);
}
}
return vo;
// for (String parentName : parentLists) {
// List<String> permissions = permissionService.getPermissionByPermissionName(parentName);
// PermissionGroupVo permissionGroupVo = new PermissionGroupVo();
// permissionGroupVo.setParentName(parentName);
// List<PermissionShowVo> permissionShowVosList = new ArrayList<>();
// for (String permission : permissions) {
// PermissionShowVo permissionShowVo = new PermissionShowVo();
// if (permissionLists.contains(permission)) {
// permissionShowVo.setPermissionName(permission);
// if (rolePermission.contains(permission)) {
// permissionShowVo.setChecked(true);
// } else {
// permissionShowVo.setChecked(false);
// }
// permissionShowVosList.add(permissionShowVo);
// }
// }
// permissionGroupVo.setPermissionShowVoList(permissionShowVosList);
// if (permissionShowVosList.size() > 0) {
// vo.add(permissionGroupVo);
// }
// }
return sideGroupVos;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment