From 94b548aa319d8aa1da1949910386cdf051d2aad1 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Fri, 16 Oct 2020 14:44:56 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20SysRolePermission=20=E3=80=81=20SysUser?= =?UTF-8?q?Role=20=E6=B7=BB=E5=8A=A0id=E5=AD=97=E6=AE=B5;=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/controller/SysRoleController.java | 14 ----------- .../sys/model/entity/SysRolePermission.java | 10 ++++---- .../modules/sys/model/entity/SysUserRole.java | 5 ++++ .../sys/service/SysRolePermissionService.java | 8 ------- .../impl/SysRolePermissionServiceImpl.java | 23 ------------------- doc/update_sql/0.0.6.sql | 9 ++++++-- 6 files changed, 17 insertions(+), 52 deletions(-) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java index 8e800727..d6d5c869 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java @@ -118,20 +118,6 @@ public class SysRoleController { return R.ok(sysRoleService.list(Wrappers.emptyWrapper())); } - /** - * 更新角色权限 - * @param roleId 角色ID - * @param permissionIds 权限ID数组 - * @return success、false - */ - @PutMapping("/permission/ids/{roleId}") - @ApiOperation(value = "更新角色权限", notes = "更新角色权限") - @UpdateOperationLogging(msg = "更新角色权限") - @PreAuthorize("@per.hasPermission('sys:sysrole:grant')") - public R savePermissionIds(@PathVariable Integer roleId, @RequestBody Integer[] permissionIds) { - return R.ok(sysRolePermissionService.saveRolePermissions(roleId, permissionIds)); - } - /** * 更新角色权限 * @param roleCode 角色Code diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java index 720ce4cc..f7a0abf1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java @@ -1,5 +1,8 @@ package com.hccake.ballcat.admin.modules.sys.model.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; @@ -23,11 +26,8 @@ public class SysRolePermission extends Model { private static final long serialVersionUID = 1L; - /** - * 角色ID - */ - @ApiModelProperty(value = "角色id") - private Integer roleId; + @TableId(type = IdType.AUTO) + private Long id; /** * 角色 Code diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java index fb42bab4..a60246c3 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java @@ -1,5 +1,7 @@ package com.hccake.ballcat.admin.modules.sys.model.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; @@ -23,6 +25,9 @@ public class SysUserRole extends Model { private static final long serialVersionUID = 1L; + @TableId(type = IdType.AUTO) + private Long id; + /** * 用户ID */ diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java index 7597efd5..4132db2e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java @@ -13,14 +13,6 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission; */ public interface SysRolePermissionService extends IService { - /** - * 更新角色菜单 - * @param roleId 角色 - * @param permissionIds 权限ID数组 - * @return - */ - Boolean saveRolePermissions(Integer roleId, Integer[] permissionIds); - /** * 更新角色菜单 * @param roleCode 角色 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java index 86b80344..cdeb857a 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java @@ -23,29 +23,6 @@ import org.springframework.transaction.annotation.Transactional; public class SysRolePermissionServiceImpl extends ServiceImpl implements SysRolePermissionService { - /** - * @param roleId 角色 - * @param permissionIds 权限ID集合 - * @return - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveRolePermissions(Integer roleId, Integer[] permissionIds) { - this.remove(Wrappers.query().lambda().eq(SysRolePermission::getRoleId, roleId)); - - if (permissionIds == null || permissionIds.length == 0) { - return Boolean.TRUE; - } - List rolePermissionList = Arrays.stream(permissionIds).map(permissionId -> { - SysRolePermission rolePermission = new SysRolePermission(); - rolePermission.setRoleId(roleId); - rolePermission.setPermissionId(permissionId); - return rolePermission; - }).collect(Collectors.toList()); - - return this.saveBatch(rolePermissionList); - } - /** * @param roleCode 角色 * @param permissionIds 权限ID集合 diff --git a/doc/update_sql/0.0.6.sql b/doc/update_sql/0.0.6.sql index 846e385a..194c04c2 100644 --- a/doc/update_sql/0.0.6.sql +++ b/doc/update_sql/0.0.6.sql @@ -69,14 +69,19 @@ ALTER TABLE `sys_role` ALTER TABLE `sys_role` DROP INDEX `uk_code_deleted`, ADD UNIQUE INDEX `uk_code_deleted` (`code`, `deleted`) USING BTREE; --- 手动删除 user_id 和 role_id 的索引 + +alter table sys_user_role drop primary key ; +alter table sys_user_role add column `id` bigint(20) NOT NULL primary key AUTO_INCREMENT FIRST; + alter table sys_user_role add column `role_code` varchar(64) comment 'role code'; alter table sys_user_role add unique (`role_code`,`user_id`); update sys_user_role set `role_code`= (select `code` from sys_role where `id`=`role_id`) where role_code is null; alter table sys_user_role modify column `role_code` varchar(64) not null comment 'role code'; alter table sys_user_role drop `role_id`; --- 手动删除 permission_id 和 role_id 的索引 +alter table sys_role_permission drop primary key ; +alter table sys_role_permission add column `id` bigint(20) NOT NULL primary key AUTO_INCREMENT FIRST; + alter table sys_role_permission add column `role_code` varchar(64) comment 'role code'; alter table sys_role_permission add unique (`role_code`,`permission_id`); update sys_role_permission set `role_code`= (select `code` from sys_role where `id`=`role_id`) where role_code is null;