From 59464c1c134c0888d859e775b29369ddb7f63946 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 21 Dec 2023 16:12:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysmenurole/SysMenuRoleFeign.java | 12 ++++++++-- .../sysrolefunction/SysRoleFunctionFeign.java | 1 + .../biz/sysmenurole/SysMenuRoleMapper.java | 7 ++++++ .../biz/sysmenurole/SysMenuRoleMapper.xml | 15 +++++++++++++ .../biz/sysmenurole/SysMenuRoleRest.java | 10 +++++++++ .../biz/sysmenurole/SysMenuRoleService.java | 22 +++++++++++++++++++ 6 files changed, 65 insertions(+), 2 deletions(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java index a0cce20f6d..a7cfacfe31 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java @@ -39,14 +39,22 @@ public interface SysMenuRoleFeign { @PostMapping("/listAll") public ResultBean> listAll(@RequestBody SysMenuRoleQuery query); - @ApiOperation("根据角色查询授权的菜单列表") + @ApiOperation("根据角色查询授权的菜单列表(PC)") @PostMapping("/selMenuByRole") public ResultBean> selMenuByRole(@RequestBody SysMenuRoleDataQuery query); - @ApiOperation("修改角色菜单的数据权限") + @ApiOperation("根据角色查询授权的菜单列表(APP)") + @PostMapping("/selMenuByRoleApp") + public ResultBean> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query); + + @ApiOperation("修改角色菜单的数据权限（PC）") @PostMapping("/updateDataByRoleMenu") public ResultBean updateDataByRoleMenu(@RequestBody List dtos); + @ApiOperation("修改角色菜单的数据权限（移动端）") + @PostMapping("/updateDataByRoleMenuApp") + public ResultBean updateDataByRoleMenuApp(@RequestBody List dtos); + @ApiOperation("所有数据列表") @GetMapping("/list") public ResultBean> list(); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java index 76b8104d9a..7a9f25af9e 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java @@ -50,6 +50,7 @@ public interface SysRoleFunctionFeign { @ApiOperation("修改保存") @PostMapping("/update/{sid}") public ResultBean update(@RequestBody SysRoleFunctionDto dto,@PathVariable("sid") String sid); + @ApiOperation("修改角色的功能配置") @PostMapping("/updateRoleAndFunction") public ResultBean updateRoleAndFunction(@RequestBody SysRoleFunctionDto dto); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java index 00fac27641..9f1103f925 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java @@ -48,6 +48,13 @@ public interface SysMenuRoleMapper extends BaseMapper { List selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw); + List selMenuByRoleApp(@Param(Constants.WRAPPER) QueryWrapper qw); + @Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}") void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId); + + @Update("update sys_mobile_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}") + void updateDataByRoleMenuApp(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId); + + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml index 3a06198e72..6fc3c6a1b3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml @@ -56,4 +56,19 @@ ${ew.sqlSegment} + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java index d2541a838e..ddf4dd087d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java @@ -58,11 +58,21 @@ public class SysMenuRoleRest implements SysMenuRoleFeign { return sysMenuRoleService.selMenuByRole(query); } + @Override + public ResultBean> selMenuByRoleApp(SysMenuRoleDataQuery query) { + return sysMenuRoleService.selMenuByRoleApp(query); + } + @Override public ResultBean updateDataByRoleMenu(List dtos) { return sysMenuRoleService.updateDataByRoleMenu(dtos); } + @Override + public ResultBean updateDataByRoleMenuApp(List dtos) { + return sysMenuRoleService.updateDataByRoleMenuApp(dtos); + } + @Override public ResultBean> list(){ ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java index beb688f30e..e8fd9bb141 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java @@ -176,6 +176,17 @@ public class SysMenuRoleService extends MybatisBaseService> selMenuByRoleApp(SysMenuRoleDataQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("smmr.roleSid",query.getRoleSid()); + if (StringUtils.isNotBlank(query.getMenuName())){ + qw.like("smm.name",query.getMenuName()); + } + List sysMenuRoleDataVos = baseMapper.selMenuByRoleApp(qw); + return rb.success().setData(sysMenuRoleDataVos); + } + public ResultBean updateDataByRoleMenu(List dtos) { ResultBean rb = ResultBean.fireFail(); for (SysMenuRoleDataDto dto : dtos) { @@ -185,6 +196,17 @@ public class SysMenuRoleService extends MybatisBaseService dtos) { + ResultBean rb = ResultBean.fireFail(); + for (SysMenuRoleDataDto dto : dtos) { + if (StringUtils.isNotBlank(dto.getDataRuleId())){ + baseMapper.updateDataByRoleMenuApp(dto.getSid(),dto.getDataRuleId()); + } + } + return rb.success(); + } + ///----获平台角色s的某个资源的菜单树形列表（内存操作） 开始----