From e8225fbdee782bbabecda08d6d1a285e39c5ca3b Mon Sep 17 00:00:00 2001 From: MichelleChung <1242874891@qq.com> Date: 星期四, 02 二月 2023 16:15:52 +0800 Subject: [PATCH] !282 System 相关表请求响应参数优化 * update 更新 system 相关表接口 (sys_role) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_notice, sys_post) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_menu) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_dict_data, sys_dict_type) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_config, sys_dept) 新增 Bo | Vo 类, 更改请求以及响应参数 ; --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java index 0dce18b..87d6ca2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java @@ -13,9 +13,10 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.system.domain.SysDept; -import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.domain.bo.SysRoleBo; +import com.ruoyi.system.domain.vo.SysRoleVo; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; @@ -49,7 +50,7 @@ */ @SaCheckPermission("system:role:list") @GetMapping("/list") - public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) { + public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) { return roleService.selectPageRoleList(role, pageQuery); } @@ -59,9 +60,9 @@ @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.EXPORT) @SaCheckPermission("system:role:export") @PostMapping("/export") - public void export(SysRole role, HttpServletResponse response) { - List<SysRole> list = roleService.selectRoleList(role); - ExcelUtil.exportExcel(list, "瑙掕壊鏁版嵁", SysRole.class, response); + public void export(SysRoleBo role, HttpServletResponse response) { + List<SysRoleVo> list = roleService.selectRoleList(role); + ExcelUtil.exportExcel(list, "瑙掕壊鏁版嵁", SysRoleVo.class, response); } /** @@ -71,7 +72,7 @@ */ @SaCheckPermission("system:role:query") @GetMapping(value = "/{roleId}") - public R<SysRole> getInfo(@PathVariable Long roleId) { + public R<SysRoleVo> getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); return R.ok(roleService.selectRoleById(roleId)); } @@ -82,7 +83,7 @@ @SaCheckPermission("system:role:add") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.INSERT) @PostMapping - public R<Void> add(@Validated @RequestBody SysRole role) { + public R<Void> add(@Validated @RequestBody SysRoleBo role) { if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪"); } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { @@ -98,7 +99,7 @@ @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.UPDATE) @PutMapping - public R<Void> edit(@Validated @RequestBody SysRole role) { + public R<Void> edit(@Validated @RequestBody SysRoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { @@ -126,7 +127,7 @@ @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public R<Void> dataScope(@RequestBody SysRole role) { + public R<Void> dataScope(@RequestBody SysRoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.authDataScope(role)); @@ -138,7 +139,7 @@ @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R<Void> changeStatus(@RequestBody SysRole role) { + public R<Void> changeStatus(@RequestBody SysRoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.updateRoleStatus(role)); @@ -161,7 +162,7 @@ */ @SaCheckPermission("system:role:query") @GetMapping("/optionselect") - public R<List<SysRole>> optionselect() { + public R<List<SysRoleVo>> optionselect() { return R.ok(roleService.selectRoleAll()); } -- Gitblit v1.9.3