From 1e4b4f686f4462786c75b9a9f2cd59f29d8b2140 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 14:05:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java | 137 +++++++++++++++++++++------------------------
1 files changed, 65 insertions(+), 72 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
index 25ac609..b0ef148 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
@@ -25,82 +25,75 @@
/**
* 用户和角色关联Controller
- *
+ *
* @author xiaochen
* @date 2023-06-12
*/
@RestController
@RequestMapping("/userRole")
-public class SysUserRoleController extends BaseController
-{
- @Autowired
- private ISysUserRoleService sysUserRoleService;
-
- /**
- * 查询用户和角色关联列表
- */
- @RequiresPermissions("car:role:list")
- @GetMapping("/list")
- public TableDataInfo list(SysUserRole sysUserRole)
- {
- startPage();
- List<SysUserRole> list = sysUserRoleService.selectSysUserRoleList(sysUserRole);
- return getDataTable(list);
- }
-
- /**
- * 导出用户和角色关联列表
- */
- @RequiresPermissions("car:role:export")
- @Log(title = "用户和角色关联", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysUserRole sysUserRole)
- {
- List<SysUserRole> list = sysUserRoleService.selectSysUserRoleList(sysUserRole);
- ExcelUtil<SysUserRole> util = new ExcelUtil<SysUserRole>(SysUserRole.class);
- util.exportExcel(response, list, "用户和角色关联数据");
- }
-
- /**
- * 获取用户和角色关联详细信息
- */
- @RequiresPermissions("car:role:query")
- @GetMapping(value = "/{userId}")
- public AjaxResult getInfo(@PathVariable("userId") Long userId)
- {
- return success(sysUserRoleService.selectSysUserRoleByUserId(userId));
- }
-
- /**
- * 新增用户和角色关联
- */
- @RequiresPermissions("car:role:add")
- @Log(title = "用户和角色关联", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SysUserRole sysUserRole)
- {
- return toAjax(sysUserRoleService.insertSysUserRole(sysUserRole));
- }
-
- /**
- * 修改用户和角色关联
- */
- @RequiresPermissions("car:role:edit")
- @Log(title = "用户和角色关联", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SysUserRole sysUserRole)
- {
- return toAjax(sysUserRoleService.updateSysUserRole(sysUserRole));
- }
-
- /**
- * 删除用户和角色关联
- */
- @RequiresPermissions("car:role:remove")
- @Log(title = "用户和角色关联", businessType = BusinessType.DELETE)
+public class SysUserRoleController extends BaseController {
+ @Autowired
+ private ISysUserRoleService sysUserRoleService;
+
+ /**
+ * 查询用户和角色关联列表
+ */
+ @RequiresPermissions("car:role:list")
+ @GetMapping("/list")
+ public TableDataInfo list(SysUserRole sysUserRole) {
+ startPage();
+ List<SysUserRole> list = sysUserRoleService.selectSysUserRoleList(sysUserRole);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出用户和角色关联列表
+ */
+ @RequiresPermissions("car:role:export")
+ @Log(title = "用户和角色关联", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysUserRole sysUserRole) {
+ List<SysUserRole> list = sysUserRoleService.selectSysUserRoleList(sysUserRole);
+ ExcelUtil<SysUserRole> util = new ExcelUtil<SysUserRole>(SysUserRole.class);
+ util.exportExcel(response, list, "用户和角色关联数据");
+ }
+
+ /**
+ * 获取用户和角色关联详细信息
+ */
+ @RequiresPermissions("car:role:query")
+ @GetMapping(value = "/{userId}")
+ public AjaxResult getInfo(@PathVariable("userId") Long userId) {
+ return success(sysUserRoleService.selectSysUserRoleByUserId(userId));
+ }
+
+ /**
+ * 新增用户和角色关联
+ */
+ @RequiresPermissions("car:role:add")
+ @Log(title = "用户和角色关联", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody SysUserRole sysUserRole) {
+ return toAjax(sysUserRoleService.insertSysUserRole(sysUserRole));
+ }
+
+ /**
+ * 修改用户和角色关联
+ */
+ @RequiresPermissions("car:role:edit")
+ @Log(title = "用户和角色关联", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody SysUserRole sysUserRole) {
+ return toAjax(sysUserRoleService.updateSysUserRole(sysUserRole));
+ }
+
+ /**
+ * 删除用户和角色关联
+ */
+ @RequiresPermissions("car:role:remove")
+ @Log(title = "用户和角色关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
- public AjaxResult remove(@PathVariable Long[] userIds)
- {
- return toAjax(sysUserRoleService.deleteSysUserRoleByUserIds(userIds));
- }
+ public AjaxResult remove(@PathVariable Long[] userIds) {
+ return toAjax(sysUserRoleService.deleteSysUserRoleByUserIds(userIds));
+ }
}
--
Gitblit v1.7.1