From f237a61c412870933f47316a011237cd538de9bc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 八月 2024 09:07:02 +0800
Subject: [PATCH] 新增需求
---
guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysRoleController.java | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysRoleController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysRoleController.java
index 6b30d01..aacc34c 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysRoleController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysRoleController.java
@@ -1,7 +1,8 @@
package com.stylefeng.guns.modular.code.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.google.gson.Gson;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.stylefeng.guns.core.cache.CacheKit;
import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.constant.Const;
@@ -15,7 +16,9 @@
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dto.DeptQuery;
import com.stylefeng.guns.modular.system.dto.TreeBean;
+import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.modular.system.model.Role;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IMenuService;
@@ -32,6 +35,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,17 +53,17 @@
@GetMapping(value = "/list")
@ApiOperation(value = "列表", tags = {"后台-角色管理"})
@ResponseBody
- public Object list(@RequestParam(required = false) String roleName) {
- List<Map<String, Object>> roles = this.roleService.selectRoles(roleName);
- return roles;
+ public ResultUtil<PageInfo<Map>> list(DeptQuery req) {
+ List<Map<String, Object>> roles = this.roleService.selectRoles(req.getDeptName());
+ PageInfo<Map> info=new PageInfo<>(roles);
+ return ResultUtil.success(info);
}
-
@PostMapping(value = "/add")
@BussinessLog(value = "添加角色", key = "name", dict = RoleDict.class)
@ApiOperation(value = "添加角色", tags = {"后台-角色管理"})
@ResponseBody
- public ResultUtil add(@Valid Role role, BindingResult result) {
+ public ResultUtil add(@Valid Role role, @RequestParam("ids") String ids,BindingResult result) {
if (result.hasErrors()) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
@@ -67,10 +71,9 @@
role.setDeptid(0);
role.setPid(0);
role.setInsertTime(new Date());
-
role.setCreateBy(Objects.requireNonNull(ShiroKit.getUser()).id);
-
this.roleService.insert(role);
+ this.roleService.setAuthority(role.getId(), ids);
return ResultUtil.success("添加成功");
}
@@ -88,16 +91,16 @@
@BussinessLog(value = "修改角色", key = "name", dict = RoleDict.class)
@ApiOperation(value = "修改角色", tags = {"后台-角色管理"})
@ResponseBody
- public ResultUtil edit(@Valid Role role, BindingResult result) {
- if (result.hasErrors()) {
- throw new GunsException(BizExceptionEnum.REQUEST_NULL);
- }
+ public ResultUtil edit(@RequestParam("id") Integer roleId, @RequestParam("name") String name,@RequestParam("ids") String ids) {
+
+ Role role = roleService.selectById(roleId);
role.setDeptid(0);
+ role.setName(name);
role.setPid(0);
this.roleService.updateById(role);
+ this.roleService.setAuthority(role.getId(), ids);
return ResultUtil.success("修改成功");
}
-
@PostMapping(value = "/delete")
@BussinessLog(value = "删除角色", key = "name", dict = RoleDict.class)
@@ -140,39 +143,20 @@
@ApiOperation(value = "角色分配权限获取列表", tags = {"后台-角色管理"})
@ResponseBody
public List<TreeBean> menuTreeListByRoleId(@PathVariable Integer roleId) {
-
List<Long> menuIds = this.menuService.getMenuIdsByRoleId(roleId);
if (ToolUtil.isEmpty(menuIds)) {
List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
-// List<ZTreeNode> parent = roleTreeList.stream().filter(e -> e.getpId() == 0).collect(Collectors.toList());
List<TreeBean> root = ListToTreeUtil.toTree(roleTreeList, "root");
return root;
}else {
+ for (Long menuId : menuIds) {
+ System.err.println("菜单id:"+menuId);
+ }
List<ZTreeNode> roleTreeListByUserId = this.menuService.menuTreeListByMenuIds(menuIds);
-// List<ZTreeNode> parent = roleTreeListByUserId.stream().filter(e -> e.getpId() == 0).collect(Collectors.toList());
List<TreeBean> root = ListToTreeUtil.toTree(roleTreeListByUserId, "root");
return root;
}
}
-
- private List<ZTreeNode> getParent(List<ZTreeNode> roleTreeListByUserId,List<ZTreeNode> parent){
- List<ZTreeNode> result = new ArrayList<>();
- for (ZTreeNode zTreeNode : parent) {
-
- List<ZTreeNode> children = roleTreeListByUserId.stream().filter(e -> e.getpId().equals(zTreeNode.getId())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(children)){
- zTreeNode.setChildren(children);
- }else {
- getParent(roleTreeListByUserId,children);
- }
- ZTreeNode zTreeNode1 = new ZTreeNode();
- BeanUtils.copyProperties(zTreeNode,zTreeNode1);
- result.add(zTreeNode1);
- }
- return result;
- }
-
-
@DataSource(name = "dataSourceGuns")
@RequestMapping("/setAuthority")
@BussinessLog(value = "配置权限操作", key = "roleId,ids", dict = RoleDict.class)
@@ -185,6 +169,25 @@
Role role = roleService.selectById(roleId);
return ResultUtil.success("分配成功");
}
+// private List<ZTreeNode> getParent(List<ZTreeNode> roleTreeListByUserId,List<ZTreeNode> parent){
+// List<ZTreeNode> result = new ArrayList<>();
+// for (ZTreeNode zTreeNode : parent) {
+//
+// List<ZTreeNode> children = roleTreeListByUserId.stream().filter(e -> e.getpId().equals(zTreeNode.getId())).collect(Collectors.toList());
+// if(CollectionUtils.isEmpty(children)){
+// zTreeNode.setChildren(children);
+// }else {
+// getParent(roleTreeListByUserId,children);
+// }
+// ZTreeNode zTreeNode1 = new ZTreeNode();
+// BeanUtils.copyProperties(zTreeNode,zTreeNode1);
+// result.add(zTreeNode1);
+// }
+// return result;
+// }
+
+
+
--
Gitblit v1.7.1