common-frame/hcframe
17
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

修改角色授权

Browse Source
This commit is contained in:
wcheng
2021-04-22 15:43:00 +08:00
parent 9d3e9e267b
commit 74aec0299f
4 changed files with 87 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/common/config/ShiroRealmConfig.java
View File

@@ -74,6 +74,7 @@ public class ShiroRealmConfig implements SystemRealm {
map.put("/druid/**",ShiroType.ANON);
map.put("/cas/valid",ShiroType.ANON);
map.put("/cas/logout",ShiroType.ANON);
map.put("/menu/tree",ShiroType.ANON);
// 其余路径均拦截
map.put("/**", ShiroType.AUTH);
return map;

28
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/auth/controller/MenuController.java
View File

@@ -32,13 +32,13 @@ public class MenuController {
@Autowired MenuService menuService;
@PostMapping()
@PostMapping("add")
@ApiOperation(value = "新增功能级权限", notes = "给后台传key-value对象模式即可")
public ResultVO<Object> addMenu(@RequestParam Map<String, Object> data) {
return menuService.addMenu(data);
}
@DeleteMapping()
@PostMapping("delete")
@ApiOperation(value = "删除功能级权限", notes = "删除后关联表数据也会被删除")
public ResultVO<Object> deleteMenu(@RequestParam List<Long> ids) {
return menuService.deleteMenu(ids);
@@ -50,22 +50,34 @@ public class MenuController {
return menuService.updateMenu(data, version);
}
@GetMapping()
@GetMapping("list")
@ApiOperation(value = "查询功能级权限列表")
public ResultVO<PageInfo<Map<String, Object>>> getMenuList(String data, WebPageInfo webPageInfo) {
return menuService.getMenuList(data, webPageInfo);
}
@PostMapping()
@PostMapping("addRole")
@ApiOperation(value = "角色授权", notes = "roleIds,menuIds,中间用逗号连接")
public ResultVO<Object> addRoleMenu(@RequestParam List<Long> roleIds,@RequestParam List<Long> menuIds) {
return menuService.addRoleMenu(roleIds, menuIds);
}
@PostMapping()
@ApiOperation(value = "删除角色授权", notes = "ids,中间用逗号连接")
public ResultVO<Object> deleteRoleMenu(@RequestParam String ids) {
return menuService.deleteRoleMenu(ids);
@PostMapping("updateRole")
@ApiOperation(value = "角色授权", notes = "roleIds,menuIds,中间用逗号连接")
public ResultVO<Object> updateRoleMenu(@RequestParam List<Long> roleIds,@RequestParam List<Long> menuIds) {
return menuService.updateRoleMenu(roleIds, menuIds);
}
@GetMapping("tree")
@ApiOperation(value = "功能级权限树，根节点是业务系统")
public ResultVO<Object> getMenuTree() {
return menuService.getMenuTree();
}
@GetMapping("selected")
@ApiOperation(value = "获取当前角色已选中节点")
public ResultVO<Object> getSelectedMenu(Long roldId) {
return menuService.getSelectedMenu(roldId);
}
}

6
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/auth/service/MenuService.java
View File

@@ -24,6 +24,10 @@ public interface MenuService {
ResultVO<Object> addRoleMenu(List<Long> roleIds, List<Long> menuIds);
ResultVO<Object> deleteRoleMenu(String ids);
ResultVO<Object> getMenuTree();
ResultVO<Object> getSelectedMenu(Long roldId);
ResultVO<Object> updateRoleMenu(List<Long> roleIds, List<Long> menuIds);
}

67
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/auth/service/impl/MenuServiceImpl.java → hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/auth/service/impl/MenuServiceImpl2.java
View File

@@ -1,5 +1,6 @@
package com.hcframe.user.module.auth.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -25,7 +26,7 @@ import com.hcframe.user.module.auth.service.MenuService;
* @description 功能级权限增删改查
*/
@Service
public class MenuServiceImpl implements MenuService {
public class MenuServiceImpl2 implements MenuService {
private static final OsSysTable OS_SYS_MENU = OsSysTable.builder().tableName("OS_SYS_MENU").tablePk("MENU_ID").build();
private static final OsSysTable OS_REL_ROLE_MENU = OsSysTable.builder().tableName("OS_REL_ROLE_MENU").tablePk("ROLE_MENU_ID").build();
@@ -41,11 +42,17 @@ public class MenuServiceImpl implements MenuService {
if (StringUtils.isBlank((String) data.get("MENU_NAME"))) {
return ResultVO.getFailed("菜单名称不能为空");
}
if (StringUtils.isBlank((String) data.get("PATH"))) {
return ResultVO.getFailed("PATH不能为空");
}
Condition condition = Condition.creatCriteria().andEqual("MENU_NAME", data.get("MENU_NAME")).andEqual("DELETED",1).build();
Long i = baseMapper.count("OS_SYS_MENU", condition);
if (i > 0L) {
if (baseMapper.count("OS_SYS_MENU", condition) > 0L) {
return ResultVO.getFailed("菜单名称不能重复");
}
Condition condition1 = Condition.creatCriteria().andEqual("PATH", data.get("PATH")).andEqual("DELETED",1).build();
if (baseMapper.count("OS_SYS_MENU", condition1) > 0L) {
return ResultVO.getFailed("PATH不能重复");
}
tableService.saveWithDate(OS_SYS_MENU, data);
return ResultVO.getSuccess();
}
@@ -110,9 +117,57 @@ public class MenuServiceImpl implements MenuService {
}
@Override
public ResultVO<Object> deleteRoleMenu(String ids) {
tableService.logicDelete(OS_REL_ROLE_MENU, ids);
return ResultVO.getSuccess();
public ResultVO<Object> updateRoleMenu(List<Long> roleIds, List<Long> menuIds) {
// TODO Auto-generated method stub
return null;
}
@Override
public ResultVO<Object> getMenuTree() {
List<Map<String, Object>> osList = baseMapper.selectSql(
"SELECT OS_ID AS \"id\",OS_NAME AS \"label\" FROM OS_SYS_OS WHERE DELETED=1");
osList.forEach(os -> {
List<Map<String, Object>> menuList = baseMapper.selectSql(
"SELECT MENU_ID AS \"id\",MENU_NAME AS \"label\",PARENT_ID AS \"pid\" FROM OS_SYS_MENU WHERE DELETED=1 AND OS_ID=" + os.get("id"));
os.put("children", buildTree(menuList));
os.put("id", "OS" + os.get("id"));
});
return ResultVO.getSuccess(osList);
}
private Object buildTree(List<Map<String, Object>> menuList) {
List<Map<String, Object>> tree = new ArrayList<>();
for(Map<String, Object> node : menuList) {
if((Long)node.get("pid") == 0L){
tree.add(findChild(node,menuList));
}
}
return tree;
}
private Map<String, Object> findChild(Map<String, Object> node, List<Map<String, Object>> menuList) {
for(Map<String, Object> n:menuList){
if(n.get("pid") == node.get("id")){
if(node.get("children") == null){
node.put("children", new ArrayList<Map<String, Object>>());
}
((List<Map<String,Object>>) node.get("children")).add(findChild(n,menuList));
}
}
return node;
}
@Override
public ResultVO<Object> getSelectedMenu(Long roldId) {
List<Object> ids = new ArrayList<>();
List<Map<String, Object>> osList = baseMapper.selectSql("SELECT OS_ID FROM OS_REL_ROLE_OS WHERE DELETED=1 AND ROLE_ID=" + roldId);
osList.forEach(os -> {
ids.add("OS" + os.get("OS_ID"));
});
List<Map<String, Object>> menuList = baseMapper.selectSql("SELECT MENU_ID FROM OS_REL_ROLE_MENU WHERE DELETED=1 AND ROLE_ID=" + roldId);
menuList.forEach(menu -> {
ids.add(menu.get("MENU_ID"));
});
return ResultVO.getSuccess(ids);
}
}