From c1158932faaff6c2c047c46d56af3f6f81f8c929 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 5 Mar 2021 17:20:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/base/domain/SysRole.java | 2 + .../dataease/base/domain/SysRoleExample.java | 70 +++++++++++++++++++ .../io/dataease/base/mapper/SysRoleMapper.xml | 31 +++++--- .../base/mapper/ext/ExtSysRoleMapper.java | 6 +- .../base/mapper/ext/ExtSysRoleMapper.xml | 19 +++-- .../controller/sys/SysRoleController.java | 12 +++- .../sys/response/RoleNodeResponse.java | 14 ---- .../dataease/service/sys/SysRoleService.java | 10 ++- frontend/src/api/system/role.js | 9 ++- frontend/src/views/system/role/index.vue | 13 +++- 10 files changed, 142 insertions(+), 44 deletions(-) delete mode 100644 backend/src/main/java/io/dataease/controller/sys/response/RoleNodeResponse.java diff --git a/backend/src/main/java/io/dataease/base/domain/SysRole.java b/backend/src/main/java/io/dataease/base/domain/SysRole.java index 85e561117b..88537d362d 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysRole.java +++ b/backend/src/main/java/io/dataease/base/domain/SysRole.java @@ -7,6 +7,8 @@ import lombok.Data; public class SysRole implements Serializable { private Long roleId; + private String code; + private String name; private String description; diff --git a/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java b/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java index bf2c892cdc..9746df6a7a 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java +++ b/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java @@ -164,6 +164,76 @@ public class SysRoleExample { return (Criteria) this; } + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + public Criteria andNameIsNull() { addCriterion("`name` is null"); return (Criteria) this; diff --git a/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.xml index 3af3284422..4ac1cbb63c 100644 --- a/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.xml @@ -3,6 +3,7 @@ + @@ -69,7 +70,7 @@ - role_id, `name`, description, create_by, update_by, create_time, update_time + role_id, code, `name`, description, create_by, update_by, create_time, update_time - select r.*, m.menu_id - from sys_role r left join sys_roles_menus m on r.role_id = m.role_id + + + diff --git a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java index ca5c9bf163..eb1cb93a2a 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java @@ -8,7 +8,6 @@ import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.sys.request.RoleGridRequest; import io.dataease.controller.sys.request.RoleMenusRequest; -import io.dataease.controller.sys.response.RoleNodeResponse; import io.dataease.controller.sys.response.RoleUserItem; import io.dataease.service.sys.SysRoleService; import io.swagger.annotations.Api; @@ -50,9 +49,16 @@ public class SysRoleController { @ApiOperation("查询角色") @PostMapping("/roleGrid/{goPage}/{pageSize}") - public Pager> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody RoleGridRequest request) { + public Pager> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody RoleGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); - return PageUtils.setPageInfo(page, sysRoleService.query(request)); + Pager> listPager = PageUtils.setPageInfo(page, sysRoleService.query(request)); + return listPager; + } + + @ApiOperation("查询角色对应的菜单ID") + @PostMapping("/menuIds/{roleId}") + public List menuIdsByRoleId(@PathVariable("roleId") Long roleId){ + return sysRoleService.menuIds(roleId); } diff --git a/backend/src/main/java/io/dataease/controller/sys/response/RoleNodeResponse.java b/backend/src/main/java/io/dataease/controller/sys/response/RoleNodeResponse.java deleted file mode 100644 index ee500f16e4..0000000000 --- a/backend/src/main/java/io/dataease/controller/sys/response/RoleNodeResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.dataease.controller.sys.response; - -import io.dataease.base.domain.SysRole; -import lombok.Data; - -import java.util.List; - -@Data -public class RoleNodeResponse extends SysRole { - - private List menuIds; - - private List dataIds; -} diff --git a/backend/src/main/java/io/dataease/service/sys/SysRoleService.java b/backend/src/main/java/io/dataease/service/sys/SysRoleService.java index 6dce1dd9f5..0ad1d6f3bd 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysRoleService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysRoleService.java @@ -8,7 +8,6 @@ import io.dataease.base.mapper.SysUsersRolesMapper; import io.dataease.base.mapper.ext.ExtSysRoleMapper; import io.dataease.controller.sys.request.RoleGridRequest; import io.dataease.controller.sys.request.RoleMenusRequest; -import io.dataease.controller.sys.response.RoleNodeResponse; import io.dataease.controller.sys.response.RoleUserItem; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,6 +31,7 @@ public class SysRoleService { private SysUsersRolesMapper sysUsersRolesMapper; + public int add(SysRole role){ Long now = System.currentTimeMillis(); role.setCreateTime(now); @@ -56,12 +56,16 @@ public class SysRoleService { } - public List query(RoleGridRequest request){ - List result = extSysRoleMapper.query(request); + public List query(RoleGridRequest request){ + List result = extSysRoleMapper.query(request); return result; } + public List menuIds(Long roleId){ + return extSysRoleMapper.menuIds(roleId); + } + @Transactional public int batchSaveRolesMenus(RoleMenusRequest request){ diff --git a/frontend/src/api/system/role.js b/frontend/src/api/system/role.js index 9bc7eb2174..7407008c33 100644 --- a/frontend/src/api/system/role.js +++ b/frontend/src/api/system/role.js @@ -45,4 +45,11 @@ export function addRoleMenus(data) { data }) } -export default { addRole, editRole, delRole, roleGrid, allRoles, addRoleMenus } + +export function menuIds(roleId) { + return request({ + url: '/api/role/menuIds/' + roleId, + method: 'post' + }) +} +export default { addRole, editRole, delRole, roleGrid, allRoles, addRoleMenus, menuIds } diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue index bb8f5e339b..2d41fa805d 100644 --- a/frontend/src/views/system/role/index.vue +++ b/frontend/src/views/system/role/index.vue @@ -9,6 +9,7 @@ +