瀏覽代碼

[角色][修改]:角色接口

release_toaliyun_real
Stormeye Wu 7 年之前
父節點
當前提交
91b680500e
共有 2 個檔案被更改,包括 58 行新增8 行删除
  1. +31
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
  2. +27
    -2
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java

+ 31
- 6
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java 查看文件

@@ -52,7 +52,7 @@ public class MallRoleController extends BaseController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", 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) { public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MallRoleController::list"); logger.debug("[" + getIpAddr() + "] MallRoleController::list");
String tenantId = getTenantId(); String tenantId = getTenantId();
@@ -62,9 +62,9 @@ public class MallRoleController extends BaseController {
MallRolePermission p = new MallRolePermission(); MallRolePermission p = new MallRolePermission();
p.setRoleId(r.getId()); p.setRoleId(r.getId());
p.setTenantId(tenantId); p.setTenantId(tenantId);
PageInfo<MallRolePermission> pers = sysRolePermissionService.listAsPage(p, 1, 1000);
List<MallRolePermission> pers = sysRolePermissionService.getList(p);
String menus = ""; String menus = "";
for (MallRolePermission rp : pers.getList()) {
for (MallRolePermission rp : pers) {
menus += rp.getPermissionId() + ","; menus += rp.getPermissionId() + ",";
} }
if (menus.length() > 1) { if (menus.length() > 1) {
@@ -75,6 +75,31 @@ public class MallRoleController extends BaseController {
return new ResultData(page); 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<MallRolePermission> 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("角色保存") @ApiOperation("角色保存")
@PostMapping("saveOrUpdate") @PostMapping("saveOrUpdate")
@@ -83,7 +108,7 @@ public class MallRoleController extends BaseController {
public ResultData saveOrUpdate(@RequestBody MallRole sysRole) { public ResultData saveOrUpdate(@RequestBody MallRole sysRole) {
logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate");
MallUserInfo currentUser = getUser(); 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(), "只有系统管理员才能保存角色"); return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色");
} }
String tenantId = currentUser.getTenantId(); String tenantId = currentUser.getTenantId();
@@ -94,7 +119,7 @@ public class MallRoleController extends BaseController {
sysRole.setTenantId(tenantId); sysRole.setTenantId(tenantId);
sysRoleService.saveOrUpdate(sysRole); sysRoleService.saveOrUpdate(sysRole);
if (StringUtils.isNoneBlank(sysRole.getMenus())) { if (StringUtils.isNoneBlank(sysRole.getMenus())) {
String [] menuIds = sysRole.getMenus().split(",");
String[] menuIds = sysRole.getMenus().split(",");
List<Long> mIds = new ArrayList<>(); List<Long> mIds = new ArrayList<>();
for (String mId : menuIds) { for (String mId : menuIds) {
mIds.add(Long.valueOf(mId)); mIds.add(Long.valueOf(mId));
@@ -111,7 +136,7 @@ public class MallRoleController extends BaseController {
public ResultData delete(@RequestBody MallRole sysRole) { public ResultData delete(@RequestBody MallRole sysRole) {
logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); logger.debug("[" + getIpAddr() + "] MallRoleController::delete");
MallUserInfo currentUser = getUser(); 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(), "只有系统管理员才能删除角色"); return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除角色");
} }
MallUserRole record = new MallUserRole(); MallUserRole record = new MallUserRole();


+ 27
- 2
mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java 查看文件

@@ -62,9 +62,9 @@ public class MallRoleController extends BaseController {
MallRolePermission p = new MallRolePermission(); MallRolePermission p = new MallRolePermission();
p.setRoleId(r.getId()); p.setRoleId(r.getId());
p.setTenantId(tenantId); p.setTenantId(tenantId);
PageInfo<MallRolePermission> pers = sysRolePermissionService.listAsPage(p, 1, 1000);
List<MallRolePermission> pers = sysRolePermissionService.getList(p);
String menus = ""; String menus = "";
for (MallRolePermission rp : pers.getList()) {
for (MallRolePermission rp : pers) {
menus += rp.getPermissionId() + ","; menus += rp.getPermissionId() + ",";
} }
if (menus.length() > 1) { if (menus.length() > 1) {
@@ -75,6 +75,31 @@ public class MallRoleController extends BaseController {
return new ResultData(page); 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<MallRolePermission> 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("角色保存") @ApiOperation("角色保存")
@PostMapping("saveOrUpdate") @PostMapping("saveOrUpdate")


Loading…
取消
儲存