|
|
@ -21,7 +21,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
|
|
|
|
import com.ruoyi.common.core.web.page.TableDataInfo;
|
|
|
|
import com.ruoyi.common.core.web.page.TableDataInfo;
|
|
|
|
import com.ruoyi.common.log.annotation.Log;
|
|
|
|
import com.ruoyi.common.log.annotation.Log;
|
|
|
|
import com.ruoyi.common.log.enums.BusinessType;
|
|
|
|
import com.ruoyi.common.log.enums.BusinessType;
|
|
|
|
import com.ruoyi.common.security.annotation.PreAuthorize;
|
|
|
|
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
|
|
|
import com.ruoyi.system.api.domain.SysRole;
|
|
|
|
import com.ruoyi.system.api.domain.SysRole;
|
|
|
|
import com.ruoyi.system.api.domain.SysUser;
|
|
|
|
import com.ruoyi.system.api.domain.SysUser;
|
|
|
|
import com.ruoyi.system.domain.SysUserRole;
|
|
|
|
import com.ruoyi.system.domain.SysUserRole;
|
|
|
@ -43,7 +43,7 @@ public class SysRoleController extends BaseController
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private ISysUserService userService;
|
|
|
|
private ISysUserService userService;
|
|
|
|
|
|
|
|
|
|
|
|
@PreAuthorize(hasPermi = "system:role:list")
|
|
|
|
@RequiresPermissions("system:role:list")
|
|
|
|
@GetMapping("/list")
|
|
|
|
@GetMapping("/list")
|
|
|
|
public TableDataInfo list(SysRole role)
|
|
|
|
public TableDataInfo list(SysRole role)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -53,7 +53,7 @@ public class SysRoleController extends BaseController
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
|
|
|
|
@PreAuthorize(hasPermi = "system:role:export")
|
|
|
|
@RequiresPermissions("system:role:export")
|
|
|
|
@PostMapping("/export")
|
|
|
|
@PostMapping("/export")
|
|
|
|
public void export(HttpServletResponse response, SysRole role) throws IOException
|
|
|
|
public void export(HttpServletResponse response, SysRole role) throws IOException
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -65,7 +65,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 根据角色编号获取详细信息
|
|
|
|
* 根据角色编号获取详细信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:query")
|
|
|
|
@RequiresPermissions("system:role:query")
|
|
|
|
@GetMapping(value = "/{roleId}")
|
|
|
|
@GetMapping(value = "/{roleId}")
|
|
|
|
public AjaxResult getInfo(@PathVariable Long roleId)
|
|
|
|
public AjaxResult getInfo(@PathVariable Long roleId)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -76,7 +76,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增角色
|
|
|
|
* 新增角色
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:add")
|
|
|
|
@RequiresPermissions("system:role:add")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.INSERT)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.INSERT)
|
|
|
|
@PostMapping
|
|
|
|
@PostMapping
|
|
|
|
public AjaxResult add(@Validated @RequestBody SysRole role)
|
|
|
|
public AjaxResult add(@Validated @RequestBody SysRole role)
|
|
|
@ -97,7 +97,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 修改保存角色
|
|
|
|
* 修改保存角色
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:edit")
|
|
|
|
@RequiresPermissions("system:role:edit")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
|
|
@PutMapping
|
|
|
|
@PutMapping
|
|
|
|
public AjaxResult edit(@Validated @RequestBody SysRole role)
|
|
|
|
public AjaxResult edit(@Validated @RequestBody SysRole role)
|
|
|
@ -118,7 +118,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 修改保存数据权限
|
|
|
|
* 修改保存数据权限
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:edit")
|
|
|
|
@RequiresPermissions("system:role:edit")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
|
|
@PutMapping("/dataScope")
|
|
|
|
@PutMapping("/dataScope")
|
|
|
|
public AjaxResult dataScope(@RequestBody SysRole role)
|
|
|
|
public AjaxResult dataScope(@RequestBody SysRole role)
|
|
|
@ -130,7 +130,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 状态修改
|
|
|
|
* 状态修改
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:edit")
|
|
|
|
@RequiresPermissions("system:role:edit")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
|
|
@PutMapping("/changeStatus")
|
|
|
|
@PutMapping("/changeStatus")
|
|
|
|
public AjaxResult changeStatus(@RequestBody SysRole role)
|
|
|
|
public AjaxResult changeStatus(@RequestBody SysRole role)
|
|
|
@ -143,7 +143,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 删除角色
|
|
|
|
* 删除角色
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:remove")
|
|
|
|
@RequiresPermissions("system:role:remove")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.DELETE)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.DELETE)
|
|
|
|
@DeleteMapping("/{roleIds}")
|
|
|
|
@DeleteMapping("/{roleIds}")
|
|
|
|
public AjaxResult remove(@PathVariable Long[] roleIds)
|
|
|
|
public AjaxResult remove(@PathVariable Long[] roleIds)
|
|
|
@ -154,7 +154,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 获取角色选择框列表
|
|
|
|
* 获取角色选择框列表
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:query")
|
|
|
|
@RequiresPermissions("system:role:query")
|
|
|
|
@GetMapping("/optionselect")
|
|
|
|
@GetMapping("/optionselect")
|
|
|
|
public AjaxResult optionselect()
|
|
|
|
public AjaxResult optionselect()
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -163,7 +163,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 查询已分配用户角色列表
|
|
|
|
* 查询已分配用户角色列表
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:list")
|
|
|
|
@RequiresPermissions("system:role:list")
|
|
|
|
@GetMapping("/authUser/allocatedList")
|
|
|
|
@GetMapping("/authUser/allocatedList")
|
|
|
|
public TableDataInfo allocatedList(SysUser user)
|
|
|
|
public TableDataInfo allocatedList(SysUser user)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -175,7 +175,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 查询未分配用户角色列表
|
|
|
|
* 查询未分配用户角色列表
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:list")
|
|
|
|
@RequiresPermissions("system:role:list")
|
|
|
|
@GetMapping("/authUser/unallocatedList")
|
|
|
|
@GetMapping("/authUser/unallocatedList")
|
|
|
|
public TableDataInfo unallocatedList(SysUser user)
|
|
|
|
public TableDataInfo unallocatedList(SysUser user)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -187,7 +187,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 取消授权用户
|
|
|
|
* 取消授权用户
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:edit")
|
|
|
|
@RequiresPermissions("system:role:edit")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
|
|
@PutMapping("/authUser/cancel")
|
|
|
|
@PutMapping("/authUser/cancel")
|
|
|
|
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
|
|
|
|
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
|
|
|
@ -198,7 +198,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 批量取消授权用户
|
|
|
|
* 批量取消授权用户
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:edit")
|
|
|
|
@RequiresPermissions("system:role:edit")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
|
|
@PutMapping("/authUser/cancelAll")
|
|
|
|
@PutMapping("/authUser/cancelAll")
|
|
|
|
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
|
|
|
|
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
|
|
|
@ -209,7 +209,7 @@ public class SysRoleController extends BaseController
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 批量选择用户授权
|
|
|
|
* 批量选择用户授权
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PreAuthorize(hasPermi = "system:role:edit")
|
|
|
|
@RequiresPermissions("system:role:edit")
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
|
|
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
|
|
|
@PutMapping("/authUser/selectAll")
|
|
|
|
@PutMapping("/authUser/selectAll")
|
|
|
|
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
|
|
|
|
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
|
|
|
|