From c5857a50d688d0c42b3893854e6f30dc45e61ca9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 22:32:12 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysRoleController.java | 728 ++++++++++++++++++++++++-------------------------------
1 files changed, 323 insertions(+), 405 deletions(-)
diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysRoleController.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysRoleController.java
index d02dd60..67114ce 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysRoleController.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysRoleController.java
@@ -1,478 +1,396 @@
package com.xinquan.system.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xinquan.common.core.utils.poi.ExcelUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xinquan.common.core.domain.R;
+import com.xinquan.common.core.utils.StringUtils;
+import com.xinquan.common.core.utils.page.PageDTO;
import com.xinquan.common.core.web.controller.BaseController;
import com.xinquan.common.core.web.domain.AjaxResult;
import com.xinquan.common.core.web.page.PageInfo;
-import com.xinquan.common.core.web.page.TableDataInfo;
import com.xinquan.common.log.annotation.Log;
import com.xinquan.common.log.enums.BusinessType;
-import com.xinquan.common.security.annotation.RequiresPermissions;
-import com.xinquan.common.security.utils.SecurityUtils;
-import com.xinquan.system.api.domain.SysDept;
+import com.xinquan.common.security.service.TokenService;
+import com.xinquan.system.api.domain.SysMenu;
import com.xinquan.system.api.domain.SysRole;
-import com.xinquan.system.api.domain.SysUser;
-import com.xinquan.system.domain.SysMenus;
-import com.xinquan.system.domain.SysRoleMenu;
+import com.xinquan.system.api.domain.vo.SysUserVO;
+import com.xinquan.system.api.model.LoginUser;
import com.xinquan.system.domain.SysUserRole;
-import com.xinquan.system.domain.dto.RoleAddDto;
-import com.xinquan.system.domain.dto.RoleUpdateDto;
+import com.xinquan.system.domain.dto.SysRoleDTO;
+import com.xinquan.system.domain.dto.SysRoleQuery;
import com.xinquan.system.domain.vo.RoleInfoVo;
-import com.xinquan.system.mapper.SysMenuMapper;
-import com.xinquan.system.mapper.SysRoleMenuMapper;
-import com.xinquan.system.service.ISysDeptService;
-import com.xinquan.system.service.ISysRoleService;
-import com.xinquan.system.service.ISysUserRoleService;
-import com.xinquan.system.service.ISysUserService;
+import com.xinquan.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* 角色信息
*
* @author ruoyi
*/
+/**
+ * 角色信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "角色信息")
@RestController
-@RequestMapping("/role")
-@Api(tags = "角色模块")
+@RequestMapping("/system/role")
public class SysRoleController extends BaseController
{
@Autowired
private ISysRoleService roleService;
@Autowired
+ private TokenService tokenService;
+
+ @Autowired
+ private ISysPermissionService permissionService;
+
+ @Autowired
private ISysUserService userService;
@Autowired
private ISysDeptService deptService;
-
- @Resource
- private SysRoleMenuMapper sysRoleMenuMapper;
-
@Autowired
+ private ISysMenuService menuService;
+ @Resource
private ISysUserRoleService sysUserRoleService;
+ // @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @ApiOperation(value = "角色列表")
+ @PostMapping("/list")
+ public AjaxResult<PageDTO<SysRole>> list(@RequestBody SysRoleQuery query)
+ {
+ Page<SysRole> res = new Page<>(query.getPageCurr(), query.getPageSize());
- @Resource
- private SysMenuMapper menuMapper;
+ PageInfo<SysRole> list = roleService.selectList(query);
+ for (SysRole record : list.getRecords()) {
+ int size = sysUserRoleService.lambdaQuery().eq(SysUserRole::getRoleId, record.getRoleId())
+ .list().size();
+ record.setRoleCount(size);
+ }
+ res.setRecords(list.getRecords());
+ PageDTO<SysRole> sysUserVOPageDTO = PageDTO.of(res, SysRole.class);
+ return AjaxResult.success(sysUserVOPageDTO);
+ }
+ @ApiOperation(value = "批量删除角色")
+ @Log(title = "角色信息-角色删除角色", businessType = BusinessType.DELETE)
+ @DeleteMapping("/deleteById/{ids}")
+ public AjaxResult remove(@PathVariable String ids)
+ {
+ String[] split = ids.split(",");
+ List<Long> id = new ArrayList<>();
+ for (String s : split) {
+ id.add(Long.valueOf(s));
+ }
+ return AjaxResult.success(roleService.deleteRoleByIds(id));
+ }
- @ApiOperation("获取所有角色信息")
- @GetMapping("/list")
+ @ApiOperation(value = "角色列表不分页")
+ @PostMapping("/listNotPage")
public AjaxResult list()
{
- SysRole role = new SysRole();
- List<SysRole> list = roleService.selectRoleList(role);
+ List<SysRole> list = roleService.selectRoleList(new SysRole());
return AjaxResult.success(list);
}
-
-
- @ApiOperation("获取所有角色信息--分页")
- @GetMapping("/listPage")
- public AjaxResult listPage(int pageNumber,int pageSize)
- {
- PageInfo<SysRole> pageInfo = new PageInfo<>(pageNumber, pageSize);
-
- PageInfo<SysRole> page = roleService.page(pageInfo, new LambdaQueryWrapper<SysRole>().ne(SysRole::getRoleId,20));
- return AjaxResult.success(page);
- }
-
-
- @ApiOperation("角色启用停用")
- @GetMapping("/roleStart")
- public AjaxResult roleStart(Long roleId)
- {
- SysRole role = roleService.selectRoleById(roleId);
- if(role.getStatus().equals("1")){
- role.setStatus("0");
- }else {
- role.setStatus("1");
- }
- return AjaxResult.success(roleService.updateRole(role));
- }
-
-
-
- @ApiOperation("添加角色")
- @PostMapping("/roleAdd")
- public AjaxResult roleAdd(@Validated @RequestBody RoleAddDto dto)
- {
- SysRole role = new SysRole();
- role.setRoleName(dto.getRoleName());
- long count = roleService.count(Wrappers.lambdaQuery(SysRole.class)
- .eq(SysRole::getRoleName,dto.getRoleName()));
- if(count>0){
- return AjaxResult.error("角色已存在，请重新输入");
- }
- List<Long> menuIds1 = dto.getMenuIds();
- if(CollectionUtils.isEmpty(menuIds1)){
- return AjaxResult.error("菜单id不能为空");
- }
- role.setMenuIds(dto.getMenuIds().toArray((new Long[dto.getMenuIds().size()])));
- // 添加角色
- role.setCreateBy(SecurityUtils.getUsername());
- // role.setCreateTime(new Date());
- roleService.insertRole(role);
-// ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
-// List<Long> menuIds = dto.getMenuIds();
-// for (Long menuId : menuIds) {
-// SysRoleMenu sysRoleMenu = new SysRoleMenu();
-// sysRoleMenu.setMenuId(menuId);
-// sysRoleMenu.setRoleId(role.getRoleId());
-// sysRoleMenus.add(sysRoleMenu);
+// @ApiOperation(value = "角色数量统计")
+// @PostMapping("/roleCount")
+// public AjaxResult roleCount()
+// {
+// int all = roleService.selectCount(null);
+// int normal = roleService.selectCount(0);
+// int stop = roleService.selectCount(1);
+//
+// Map<String,Integer> map = new HashMap<>();
+// map.put("all",all);
+// map.put("normal",normal);
+// map.put("stop",stop);
+// return AjaxResult.success(map);
+// }
+//
+//// @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+//// // @PreAuthorize("@ss.hasPermi('system:role:export')")
+//// @PostMapping("/export")
+//// public void export(HttpServletResponse response, SysRole role)
+//// {
+//// List<SysRole> list = roleService.selectRoleList(role);
+//// ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+//// util.exportExcel(response, list, "角色数据");
+//// }
+//
+// /**
+// * 根据角色编号获取详细信息
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:query')")
+// @GetMapping(value = "/{roleId}")
+// public AjaxResult getInfo(@PathVariable Long roleId)
+// {
+// roleService.checkRoleDataScope(roleId);
+// return AjaxResult.success(roleService.selectRoleById(roleId));
+// }
+//
+//
+// @ApiOperation("角色详情")
+// @GetMapping("/roleInfo")
+// public AjaxResult roleInfo(@RequestParam Long roleId)
+// {
+// SysRole role = roleService.selectRoleById(roleId);
+// RoleInfoVO roleInfoVo = new RoleInfoVO();
+// roleInfoVo.setRoleId(role.getRoleId());
+// roleInfoVo.setRoleName(role.getRoleName());
+// roleInfoVo.setRemark(role.getRemark());
+//
+// // 获取当前角色的菜单列表
+// List<SysMenu> menus = menuService.selectListByRoleId(roleId);
+// if(menus.size()==0){
+// return AjaxResult.success(new ArrayList<>());
// }
-// sysRoleMenuMapper.batchRoleMenu(sysRoleMenus);
+// List<Long> menusId = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
+//
+// // 获取当前的权限菜单(有层级)
+//// List<SysMenu> levelMenus = roleService.getMenuLevelList(menusId);
+//
+// roleInfoVo.setMenus(menusId);
+// return AjaxResult.success(roleInfoVo);
+// }
+//
+//
+// @ApiOperation("用户获取权限菜单")
+// @GetMapping("/roleInfoFromUserId")
+// public AjaxResult roleInfoFromUserId(@RequestParam Long userId)
+// {
+// return AjaxResult.success(roleService.roleInfoFromUserId(userId));
+// }
+//
+//
+ /**
+ * 新增角色
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:add')")
+ @ApiOperation(value = "新增角色")
+ @Log(title = "角色信息-新增角色", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@Validated @RequestBody SysRoleDTO dto)
+ {
+ Boolean flag= roleService.isExit(dto.getRoleId(),dto.getRoleName());
+ if(flag){
+ return error("新增角色'" + dto.getRoleName() + "'失败，角色名称已存在");
+ }
+ roleService.saveRole(dto);
return AjaxResult.success();
}
-
-
@ApiOperation("角色详情")
@GetMapping("/roleInfo")
- public AjaxResult roleInfo( @RequestParam Long id)
+ public AjaxResult<RoleInfoVo> roleInfo(@RequestParam Long roleId)
{
- SysRole role = roleService.selectRoleById(id);
+ SysRole role = roleService.selectRoleById(roleId);
RoleInfoVo roleInfoVo = new RoleInfoVo();
roleInfoVo.setRoleId(role.getRoleId());
roleInfoVo.setRoleName(role.getRoleName());
- // 获取当前角色的菜单id
- List<Long> menusId = sysRoleMenuMapper.selectList(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, id)).stream().map(SysRoleMenu::getMenuId).collect(Collectors.toList());
- if(menusId.size()==0){
+ roleInfoVo.setRemark(role.getRemark());
+
+ // 获取当前角色的菜单列表
+ List<SysMenu> menus = menuService.selectListByRoleId(roleId);
+ if(menus.size()==0){
return AjaxResult.success(new ArrayList<>());
}
- //获取当前的权限菜单
- List<SysMenus> all = menuMapper.getAllInIds(menusId);
- // 第三级
- List<SysMenus> s3 = all.stream().filter(e -> e.getMenuType().equals("F")).collect(Collectors.toList());
- // 第二级
- List<SysMenus> s2 = all.stream().filter(e -> e.getMenuType().equals("C")).collect(Collectors.toList());
- // 第一级
- List<SysMenus> s1 = all.stream().filter(e -> e.getMenuType().equals("M")).collect(Collectors.toList());
+ List<Long> menusId = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
- for (SysMenus menus : s2) {
- List<SysMenus> collect = s3.stream().filter(e -> e.getParentId().equals(menus.getMenuId())).collect(Collectors.toList());
- menus.setChildren(collect);
- }
-
- for (SysMenus menus : s1) {
- List<SysMenus> collect = s2.stream().filter(e -> e.getParentId().equals(menus.getMenuId())).collect(Collectors.toList());
- menus.setChildren(collect);
- }
+ // 获取当前的权限菜单(有层级)
+// List<SysMenu> levelMenus = roleService.getMenuLevelList(menusId);
roleInfoVo.setMenus(menusId);
return AjaxResult.success(roleInfoVo);
}
-
-
@ApiOperation("用户获取权限菜单")
- @GetMapping("/roleInfoFromUserId")
- public AjaxResult roleInfoFromUserId( @RequestParam Long userId)
+ @GetMapping("/roleInfoFromUserId/{userId}")
+ public R<List<SysMenu>> roleInfoFromUserId(@PathVariable("userId") Long userId)
{
- SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
- Long id =one.getRoleId();
- // 获取当前角色的菜单id
- List<Long> menusId = sysRoleMenuMapper.selectList(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, id)).stream().map(SysRoleMenu::getMenuId).collect(Collectors.toList());
- if(menusId.size()==0){
- return AjaxResult.success(new ArrayList<>());
- }
- if(id!=1){
- menusId = menusId.stream().filter(e->e!=1074 && e!=1075 && e!=1193 && e!=1194).collect(Collectors.toList());
- }
- //获取当前的权限菜单
- List<SysMenus> all = menuMapper.getAllInIds(menusId);
- // 第三级
- List<SysMenus> s3 = all.stream().filter(e -> e.getMenuType().equals("F")).collect(Collectors.toList());
- // 第二级
- List<SysMenus> s2 = all.stream().filter(e -> e.getMenuType().equals("C")).collect(Collectors.toList());
- // 第一级
- List<SysMenus> s1 = all.stream().filter(e -> e.getMenuType().equals("M")).collect(Collectors.toList());
-
- for (SysMenus menus : s2) {
- List<SysMenus> collect = s3.stream().filter(e -> e.getParentId().equals(menus.getMenuId())).collect(Collectors.toList());
- menus.setChildren(collect);
- }
-
- for (SysMenus menus : s1) {
- List<SysMenus> collect = s2.stream().filter(e -> e.getParentId().equals(menus.getMenuId())).collect(Collectors.toList());
- menus.setChildren(collect);
- }
-
- return AjaxResult.success(s1);
+ return R.ok(roleService.roleInfoFromUserId(userId));
}
-
-
-
-
- @ApiOperation("编辑角色")
- @PostMapping("/roleUpdate")
- public AjaxResult roleUpdate(@Validated @RequestBody RoleUpdateDto dto)
- {
- SysRole role = new SysRole();
- role.setRoleName(dto.getRoleName());
- SysRole one = roleService.getOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleId, dto.getRoleId()));
- List<SysRole> sysRoles = roleService.isExitUpdate(dto.getRoleName(),dto.getRoleId());
- if(sysRoles.size()>0){
- return AjaxResult.error("角色已存在，请重新输入");
- }
- // 编辑角色
- role.setUpdateBy(SecurityUtils.getUsername());
- // role.setUpdateTime(new Date());
- role.setRoleId(dto.getRoleId());
- roleService.updateRole(role);
- ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
- List<Long> menuIds = dto.getMenuIds();
- // 移除原来的权限菜单
- if(menuIds.contains(1061L)){
- sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
- .eq(SysRoleMenu::getRoleId,dto.getRoleId()));
- }else {
- sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
- .eq(SysRoleMenu::getRoleId,dto.getRoleId())
- .ne(SysRoleMenu::getMenuId,1061L)
- .ne(SysRoleMenu::getMenuId,1062L)
- .ne(SysRoleMenu::getMenuId,1065L)
- .ne(SysRoleMenu::getMenuId,1073L)
- .ne(SysRoleMenu::getMenuId,1161L)
- .ne(SysRoleMenu::getMenuId,1203L)
- );
- }
- for (Long menuId : menuIds) {
- SysRoleMenu sysRoleMenu = new SysRoleMenu();
- sysRoleMenu.setMenuId(menuId);
- sysRoleMenu.setRoleId(role.getRoleId());
- sysRoleMenus.add(sysRoleMenu);
- }
- sysRoleMenuMapper.batchRoleMenu(sysRoleMenus);
- return AjaxResult.success();
- }
-
-
-
-
-
-
-
-
-
-
-
-
- @Log(title = "角色管理", businessType = BusinessType.EXPORT)
- @RequiresPermissions("system:role:export")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysRole role)
- {
- List<SysRole> list = roleService.selectRoleList(role);
- ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
- util.exportExcel(response, list, "角色数据");
- }
-
- /**
- * 根据角色编号获取详细信息
- */
- @RequiresPermissions("system:role:query")
- @GetMapping(value = "/{roleId}")
- public AjaxResult getInfo(@PathVariable Long roleId)
- {
- roleService.checkRoleDataScope(roleId);
- return success(roleService.selectRoleById(roleId));
- }
-
- /**
- * 新增角色
- */
- @RequiresPermissions("system:role:add")
- @Log(title = "角色管理", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysRole role)
- {
- if (!roleService.checkRoleNameUnique(role))
- {
- return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
- }
- else if (!roleService.checkRoleKeyUnique(role))
- {
- return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
- }
- role.setCreateBy(SecurityUtils.getUsername());
- return toAjax(roleService.insertRole(role));
-
- }
-
/**
* 修改保存角色
*/
- @RequiresPermissions("system:role:edit")
- @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+ // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @ApiOperation(value = "编辑角色")
@PutMapping
- public AjaxResult edit(@Validated @RequestBody SysRole role)
+ public AjaxResult edit(@Validated @RequestBody SysRoleDTO dto)
{
- roleService.checkRoleAllowed(role);
- roleService.checkRoleDataScope(role.getRoleId());
- if (!roleService.checkRoleNameUnique(role))
+ Boolean flag= roleService.isExit(dto.getRoleId(),dto.getRoleName());
+ if (flag){
+ return error("修改角色'" + dto.getRoleName() + "'失败，角色名称已存在");
+ }
+ SysRole sysRole = roleService.selectRoleById(dto.getRoleId());
+ if("meal".equals(sysRole.getRoleKey()) || "sale".equals(sysRole.getRoleKey()) || "admin".equals(sysRole.getRoleKey())){
+ return error("当前角色无法修改");
+ }
+ if (roleService.editRole(dto) > 0)
{
- return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+ // 更新缓存用户权限
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (StringUtils.isNotNull(loginUser.getSysUser()) && !loginUser.getSysUser().isAdmin())
+ {
+ loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getSysUser()));
+ loginUser.setSysUser(userService.selectUserByUserName(loginUser.getSysUser().getUserName()));
+ tokenService.setLoginUser(loginUser);
+ }
+ return AjaxResult.success();
}
- else if (!roleService.checkRoleKeyUnique(role))
- {
- return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
- }
- role.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(roleService.updateRole(role));
+ return error("修改角色'" + dto.getRoleName() + "'失败，请联系管理员");
}
-
- /**
- * 修改保存数据权限
- */
- @RequiresPermissions("system:role:edit")
- @Log(title = "角色管理", businessType = BusinessType.UPDATE)
- @PutMapping("/dataScope")
- public AjaxResult dataScope(@RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- roleService.checkRoleDataScope(role.getRoleId());
- return toAjax(roleService.authDataScope(role));
- }
-
- /**
- * 状态修改
- */
- @RequiresPermissions("system:role:edit")
- @Log(title = "角色管理", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- roleService.checkRoleDataScope(role.getRoleId());
- role.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(roleService.updateRoleStatus(role));
- }
-
- /**
- * 删除角色
- */
- @RequiresPermissions("system:role:remove")
- @Log(title = "角色管理", businessType = BusinessType.DELETE)
- @DeleteMapping("/{roleIds}")
- public AjaxResult remove(@PathVariable Long[] roleIds)
- {
- return toAjax(roleService.deleteRoleByIds(roleIds));
- }
-
-
-
- /**
- * 停用角色
- */
- @RequiresPermissions("system:role:stop")
- @Log(title = "角色管理", businessType = BusinessType.STOP)
- @PutMapping("/stop")
- public AjaxResult stop(@RequestBody Long roleId)
- {
- SysRole sysRole = roleService.selectRoleById(roleId);
- if(sysRole.getStatus().equals("0")){
- sysRole.setStatus("1");
- }else {
- sysRole.setStatus("0");
- }
- return toAjax(roleService.updateRole(sysRole));
- }
-
- /**
- * 获取角色选择框列表
- */
- @RequiresPermissions("system:role:query")
- @GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
- return success(roleService.selectRoleAll());
- }
- /**
- * 查询已分配用户角色列表
- */
- @RequiresPermissions("system:role:list")
- @GetMapping("/authUser/allocatedList")
- public TableDataInfo allocatedList(SysUser user)
- {
- startPage();
- List<SysUser> list = userService.selectAllocatedList(user);
- return getDataTable(list);
- }
-
- /**
- * 查询未分配用户角色列表
- */
- @RequiresPermissions("system:role:list")
- @GetMapping("/authUser/unallocatedList")
- public TableDataInfo unallocatedList(SysUser user)
- {
- startPage();
- List<SysUser> list = userService.selectUnallocatedList(user);
- return getDataTable(list);
- }
-
- /**
- * 取消授权用户
- */
- @RequiresPermissions("system:role:edit")
- @Log(title = "角色管理", businessType = BusinessType.GRANT)
- @PutMapping("/authUser/cancel")
- public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
- {
- return toAjax(roleService.deleteAuthUser(userRole));
- }
-
- /**
- * 批量取消授权用户
- */
- @RequiresPermissions("system:role:edit")
- @Log(title = "角色管理", businessType = BusinessType.GRANT)
- @PutMapping("/authUser/cancelAll")
- public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
- {
- return toAjax(roleService.deleteAuthUsers(roleId, userIds));
- }
-
- /**
- * 批量选择用户授权
- */
- @RequiresPermissions("system:role:edit")
- @Log(title = "角色管理", businessType = BusinessType.GRANT)
- @PutMapping("/authUser/selectAll")
- public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
- {
- roleService.checkRoleDataScope(roleId);
- return toAjax(roleService.insertAuthUsers(roleId, userIds));
- }
-
- /**
- * 获取对应角色部门树列表
- */
- @RequiresPermissions("system:role:query")
- @GetMapping(value = "/deptTree/{roleId}")
- public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
- ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
- return ajax;
- }
+//
+// /**
+// * 修改保存数据权限
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+// @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+// @PutMapping("/dataScope")
+// public AjaxResult dataScope(@RequestBody SysRole role)
+// {
+// roleService.checkRoleAllowed(role);
+// roleService.checkRoleDataScope(role.getRoleId());
+// return AjaxResult.success(roleService.authDataScope(role));
+// }
+//
+// /**
+// * 状态修改
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+// @ApiOperation(value = "状态修改")
+// @Log(title = "角色信息-角色状态修改", businessType = BusinessType.UPDATE)
+// @PutMapping("/changeStatus")
+// public AjaxResult changeStatus(@RequestBody SysRole role)
+// {
+// SysRole sysRole = roleService.selectRoleById(role.getRoleId());
+// if("meal".equals(sysRole.getRoleKey()) || "sale".equals(sysRole.getRoleKey()) || "admin".equals(sysRole.getRoleKey())){
+// return error("当前角色无法修改状态");
+// }
+// role.setUpdateBy(getUsername());
+// roleService.updateStatus(role);
+// return AjaxResult.success();
+// }
+//
+// /**
+// * 删除角色
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:remove')")
+//// @ApiOperation(value = "批量删除角色")
+//// @Log(title = "角色信息-角色删除角色", businessType = BusinessType.DELETE)
+//// @DeleteMapping("/deleteById/{id}")
+//// public AjaxResult remove(@PathVariable(value = "id") Long id)
+//// {
+//// SysRole sysRole = roleService.selectRoleById(id);
+//// if("meal".equals(sysRole.getRoleKey()) || "sale".equals(sysRole.getRoleKey()) || "admin".equals(sysRole.getRoleKey())){
+//// return error("当前角色无法删除");
+//// }
+//// return AjaxResult.success(roleService.deleteRoleById(id));
+//// }
+//
+// /**
+// * 删除角色
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:remove')")
+// @ApiOperation(value = "批量删除角色")
+// @Log(title = "角色信息-角色删除角色", businessType = BusinessType.DELETE)
+// @DeleteMapping("/deleteById/{ids}")
+// public AjaxResult remove(@PathVariable String ids)
+// {
+// String[] split = ids.split(",");
+// List<Long> id = new ArrayList<>();
+// for (String s : split) {
+// id.add(Long.valueOf(s));
+// }
+// return AjaxResult.success(roleService.deleteRoleByIds(id));
+// }
+//
+// /**
+// * 获取角色选择框列表
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:query')")
+// @GetMapping("/optionselect")
+// public AjaxResult optionselect()
+// {
+// return AjaxResult.success(roleService.selectRoleAll());
+// }
+//
+// /**
+// * 查询已分配用户角色列表
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:list')")
+// @GetMapping("/authUser/allocatedList")
+// public TableDataInfo allocatedList(SysUser user)
+// {
+//// startPage();
+// List<SysUser> list = userService.selectAllocatedList(user);
+// return getDataTable(list);
+// }
+//
+// /**
+// * 查询未分配用户角色列表
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:list')")
+// @GetMapping("/authUser/unallocatedList")
+// public TableDataInfo unallocatedList(SysUser user)
+// {
+//// startPage();
+// List<SysUser> list = userService.selectUnallocatedList(user);
+// return getDataTable(list);
+// }
+//
+// /**
+// * 取消授权用户
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+// @Log(title = "角色管理", businessType = BusinessType.GRANT)
+// @PutMapping("/authUser/cancel")
+// public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+// {
+// return AjaxResult.success(roleService.deleteAuthUser(userRole));
+// }
+//
+// /**
+// * 批量取消授权用户
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+// @Log(title = "角色管理", businessType = BusinessType.GRANT)
+// @PutMapping("/authUser/cancelAll")
+// public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+// {
+// return AjaxResult.success(roleService.deleteAuthUsers(roleId, userIds));
+// }
+//
+// /**
+// * 批量选择用户授权
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+// @Log(title = "角色管理", businessType = BusinessType.GRANT)
+// @PutMapping("/authUser/selectAll")
+// public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+// {
+// roleService.checkRoleDataScope(roleId);
+// return AjaxResult.success(roleService.insertAuthUsers(roleId, userIds));
+// }
+//
+// /**
+// * 获取对应角色部门树列表
+// */
+// // @PreAuthorize("@ss.hasPermi('system:role:query')")
+// @GetMapping(value = "/deptTree/{roleId}")
+// public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
+// {
+// AjaxResult ajax = AjaxResult.success();
+// ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+// ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+// return ajax;
+// }
}
--
Gitblit v1.7.1