From 91b680500e83226be670f759c5f847bd06054793 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 17 May 2019 11:07:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=92=E8=89=B2][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MallRoleController.java | 37 ++++++++++++++++--- .../controller/sys/MallRoleController.java | 29 ++++++++++++++- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index e34889586..3d177f65e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -52,7 +52,7 @@ public class MallRoleController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "用户管理-rule列表") + @SystemControllerLog(description = "用户管理-role列表") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); String tenantId = getTenantId(); @@ -62,9 +62,9 @@ public class MallRoleController extends BaseController { MallRolePermission p = new MallRolePermission(); p.setRoleId(r.getId()); p.setTenantId(tenantId); - PageInfo pers = sysRolePermissionService.listAsPage(p, 1, 1000); + List pers = sysRolePermissionService.getList(p); String menus = ""; - for (MallRolePermission rp : pers.getList()) { + for (MallRolePermission rp : pers) { menus += rp.getPermissionId() + ","; } if (menus.length() > 1) { @@ -75,6 +75,31 @@ public class MallRoleController extends BaseController { return new ResultData(page); } + @ApiOperation("角色详情") + @GetMapping("findById") + //@RequiresPermissions("sys:role:get") + @SystemControllerLog(description = "用户管理-role信息") + public ResultData findById(MallRole sysRole) { + logger.debug("[" + getIpAddr() + "] MallRoleController::list"); + if (sysRole.getId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + MallRole role = sysRoleService.getById(sysRole.getId()); + MallRolePermission p = new MallRolePermission(); + p.setRoleId(role.getId()); + p.setTenantId(getTenantId()); + List pers = sysRolePermissionService.getList(p); + String menus = ""; + for (MallRolePermission rp : pers) { + menus += rp.getPermissionId() + ","; + } + if (menus.length() > 1) { + menus = menus.substring(0, menus.length() - 1); + } + role.setMenus(menus); + return new ResultData(role); + } + @ApiOperation("角色保存") @PostMapping("saveOrUpdate") @@ -83,7 +108,7 @@ public class MallRoleController extends BaseController { public ResultData saveOrUpdate(@RequestBody MallRole sysRole) { logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); MallUserInfo currentUser = getUser(); - if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { + if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色"); } String tenantId = currentUser.getTenantId(); @@ -94,7 +119,7 @@ public class MallRoleController extends BaseController { sysRole.setTenantId(tenantId); sysRoleService.saveOrUpdate(sysRole); if (StringUtils.isNoneBlank(sysRole.getMenus())) { - String [] menuIds = sysRole.getMenus().split(","); + String[] menuIds = sysRole.getMenus().split(","); List mIds = new ArrayList<>(); for (String mId : menuIds) { mIds.add(Long.valueOf(mId)); @@ -111,7 +136,7 @@ public class MallRoleController extends BaseController { public ResultData delete(@RequestBody MallRole sysRole) { logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); MallUserInfo currentUser = getUser(); - if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { + if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除角色"); } MallUserRole record = new MallUserRole(); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 6f79ce957..d18d0ed2b 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -62,9 +62,9 @@ public class MallRoleController extends BaseController { MallRolePermission p = new MallRolePermission(); p.setRoleId(r.getId()); p.setTenantId(tenantId); - PageInfo pers = sysRolePermissionService.listAsPage(p, 1, 1000); + List pers = sysRolePermissionService.getList(p); String menus = ""; - for (MallRolePermission rp : pers.getList()) { + for (MallRolePermission rp : pers) { menus += rp.getPermissionId() + ","; } if (menus.length() > 1) { @@ -75,6 +75,31 @@ public class MallRoleController extends BaseController { return new ResultData(page); } + @ApiOperation("角色详情") + @GetMapping("findById") + //@RequiresPermissions("sys:role:get") + @SystemControllerLog(description = "用户管理-role信息") + public ResultData findById(MallRole sysRole) { + logger.debug("[" + getIpAddr() + "] MallRoleController::list"); + if (sysRole.getId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + MallRole role = sysRoleService.getById(sysRole.getId()); + MallRolePermission p = new MallRolePermission(); + p.setRoleId(role.getId()); + p.setTenantId(getTenantId()); + List pers = sysRolePermissionService.getList(p); + String menus = ""; + for (MallRolePermission rp : pers) { + menus += rp.getPermissionId() + ","; + } + if (menus.length() > 1) { + menus = menus.substring(0, menus.length() - 1); + } + role.setMenus(menus); + return new ResultData(role); + } + @ApiOperation("角色保存") @PostMapping("saveOrUpdate")