From d62484ba62a408e8ec7de4eba5624e7e95cb44ad Mon Sep 17 00:00:00 2001 From: zhangzhikang <1013400931@qq.com> Date: Mon, 10 Oct 2022 10:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E8=A7=92=E8=89=B2=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E5=AE=A1=E6=A0=B8=E4=BA=BA,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEroleid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89userId=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E6=94=B9=E4=B8=BA=E5=8F=91=E9=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BookMeetingRoomController.java | 14 ++- .../modules/sys/dao/SysRoleUserDao.java | 77 ++++++------ .../sys/service/SysRoleUserService.java | 86 ++++++------- .../service/impl/SysRoleUserServiceImpl.java | 115 +++++++++--------- .../resources/mapper/sys/SysRoleUserDao.xml | 50 ++++---- 5 files changed, 183 insertions(+), 159 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/meeting/controller/BookMeetingRoomController.java b/renren-admin/src/main/java/io/renren/modules/meeting/controller/BookMeetingRoomController.java index 34618610..9128ae70 100644 --- a/renren-admin/src/main/java/io/renren/modules/meeting/controller/BookMeetingRoomController.java +++ b/renren-admin/src/main/java/io/renren/modules/meeting/controller/BookMeetingRoomController.java @@ -16,6 +16,7 @@ import io.renren.modules.notice.dto.SysNoticeDTO; import io.renren.modules.notice.enums.NoticeStatusEnum; import io.renren.modules.notice.service.SysNoticeService; import io.renren.modules.security.user.SecurityUser; +import io.renren.modules.sys.service.SysRoleUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -46,6 +47,8 @@ public class BookMeetingRoomController { private TMeetingroomService tMeetingroomService; @Resource private SysNoticeService sysNoticeService; + @Resource + private SysRoleUserService sysRoleUserService; @GetMapping("list") @ApiOperation("搜索可以预约的会议室") @@ -104,8 +107,15 @@ public class BookMeetingRoomController { sysNoticeDTO.setTitle("会议室申请审核通知"); sysNoticeDTO.setContent(content); // 通知内容 sysNoticeDTO.setReceiverType(1); - - sysNoticeDTO.setReceiverTypeIds(defaultAssigneeRoleId); + // 根据roleId查询userId + List useIds = sysRoleUserService.getUserIdListByRoleId(Long.parseLong(defaultAssigneeRoleId)); + if (useIds != null && useIds.size() > 0){ + String userId = ""; + for (Long use : useIds){ + userId += use.toString()+","; + } + sysNoticeDTO.setReceiverTypeIds(userId.substring(0,userId.length() -1)); + } sysNoticeDTO.setStatus(NoticeStatusEnum.SEND.value()); sysNoticeDTO.setSenderName("流程系统"); sysNoticeDTO.setSenderDate(new Date()); diff --git a/renren-admin/src/main/java/io/renren/modules/sys/dao/SysRoleUserDao.java b/renren-admin/src/main/java/io/renren/modules/sys/dao/SysRoleUserDao.java index cabde625..98884ca7 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/dao/SysRoleUserDao.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/dao/SysRoleUserDao.java @@ -1,38 +1,41 @@ -package io.renren.modules.sys.dao; - -import io.renren.common.dao.BaseDao; -import io.renren.modules.sys.entity.SysRoleUserEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 角色用户关系 - * - * @since 1.0.0 - */ -@Mapper -public interface SysRoleUserDao extends BaseDao { - - /** - * 根据角色ids，删除角色用户关系 - * - * @param roleIds 角色ids - */ - void deleteByRoleIds(Long[] roleIds); - - /** - * 根据用户id，删除角色用户关系 - * - * @param userIds 用户ids - */ - void deleteByUserIds(Long[] userIds); - - /** - * 角色ID列表 - * - * @param userId 用户ID - * @return - */ - List getRoleIdList(Long userId); +package io.renren.modules.sys.dao; + +import io.renren.common.dao.BaseDao; +import io.renren.modules.sys.entity.SysRoleUserEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 角色用户关系 + * + * @since 1.0.0 + */ +@Mapper +public interface SysRoleUserDao extends BaseDao { + + /** + * 根据角色ids，删除角色用户关系 + * + * @param roleIds 角色ids + */ + void deleteByRoleIds(Long[] roleIds); + + /** + * 根据用户id，删除角色用户关系 + * + * @param userIds 用户ids + */ + void deleteByUserIds(Long[] userIds); + + /** + * 角色ID列表 + * + * @param userId 用户ID + * @return + */ + List getRoleIdList(Long userId); + + // 根据roleId查询所有userId + List getUserIdsByRoleId(Long roleId); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/sys/service/SysRoleUserService.java b/renren-admin/src/main/java/io/renren/modules/sys/service/SysRoleUserService.java index 02f773f6..0873f49b 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/service/SysRoleUserService.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/service/SysRoleUserService.java @@ -1,43 +1,45 @@ -package io.renren.modules.sys.service; - -import io.renren.common.service.BaseService; -import io.renren.modules.sys.entity.SysRoleUserEntity; - -import java.util.List; - -/** - * 角色用户关系 - * - * @since 1.0.0 - */ -public interface SysRoleUserService extends BaseService { - - /** - * 保存或修改 - * - * @param userId 用户ID - * @param roleIdList 角色ID列表 - */ - void saveOrUpdate(Long userId, List roleIdList); - - /** - * 根据角色ids，删除角色用户关系 - * - * @param roleIds 角色ids - */ - void deleteByRoleIds(Long[] roleIds); - - /** - * 根据用户id，删除角色用户关系 - * - * @param userIds 用户ids - */ - void deleteByUserIds(Long[] userIds); - - /** - * 角色ID列表 - * - * @param userId 用户ID - */ - List getRoleIdList(Long userId); +package io.renren.modules.sys.service; + +import io.renren.common.service.BaseService; +import io.renren.modules.sys.entity.SysRoleUserEntity; + +import java.util.List; + +/** + * 角色用户关系 + * + * @since 1.0.0 + */ +public interface SysRoleUserService extends BaseService { + + /** + * 保存或修改 + * + * @param userId 用户ID + * @param roleIdList 角色ID列表 + */ + void saveOrUpdate(Long userId, List roleIdList); + + /** + * 根据角色ids，删除角色用户关系 + * + * @param roleIds 角色ids + */ + void deleteByRoleIds(Long[] roleIds); + + /** + * 根据用户id，删除角色用户关系 + * + * @param userIds 用户ids + */ + void deleteByUserIds(Long[] userIds); + + /** + * 角色ID列表 + * + * @param userId 用户ID + */ + List getRoleIdList(Long userId); + + List getUserIdListByRoleId(Long roleId); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysRoleUserServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysRoleUserServiceImpl.java index ac339d0f..12010ebd 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysRoleUserServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysRoleUserServiceImpl.java @@ -1,56 +1,61 @@ -package io.renren.modules.sys.service.impl; - -import cn.hutool.core.collection.CollUtil; -import io.renren.common.service.impl.BaseServiceImpl; -import io.renren.modules.sys.dao.SysRoleUserDao; -import io.renren.modules.sys.entity.SysRoleUserEntity; -import io.renren.modules.sys.service.SysRoleUserService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 角色用户关系 - * - * @since 1.0.0 - */ -@Service -public class SysRoleUserServiceImpl extends BaseServiceImpl implements SysRoleUserService { - - @Override - public void saveOrUpdate(Long userId, List roleIdList) { - //先删除角色用户关系 - deleteByUserIds(new Long[]{userId}); - - //用户没有一个角色权限的情况 - if (CollUtil.isEmpty(roleIdList)) { - return; - } - - //保存角色用户关系 - for (Long roleId : roleIdList) { - SysRoleUserEntity sysRoleUserEntity = new SysRoleUserEntity(); - sysRoleUserEntity.setUserId(userId); - sysRoleUserEntity.setRoleId(roleId); - - //保存 - insert(sysRoleUserEntity); - } - } - - @Override - public void deleteByRoleIds(Long[] roleIds) { - baseDao.deleteByRoleIds(roleIds); - } - - @Override - public void deleteByUserIds(Long[] userIds) { - baseDao.deleteByUserIds(userIds); - } - - @Override - public List getRoleIdList(Long userId) { - - return baseDao.getRoleIdList(userId); - } +package io.renren.modules.sys.service.impl; + +import cn.hutool.core.collection.CollUtil; +import io.renren.common.service.impl.BaseServiceImpl; +import io.renren.modules.sys.dao.SysRoleUserDao; +import io.renren.modules.sys.entity.SysRoleUserEntity; +import io.renren.modules.sys.service.SysRoleUserService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 角色用户关系 + * + * @since 1.0.0 + */ +@Service +public class SysRoleUserServiceImpl extends BaseServiceImpl implements SysRoleUserService { + + @Override + public void saveOrUpdate(Long userId, List roleIdList) { + //先删除角色用户关系 + deleteByUserIds(new Long[]{userId}); + + //用户没有一个角色权限的情况 + if (CollUtil.isEmpty(roleIdList)) { + return; + } + + //保存角色用户关系 + for (Long roleId : roleIdList) { + SysRoleUserEntity sysRoleUserEntity = new SysRoleUserEntity(); + sysRoleUserEntity.setUserId(userId); + sysRoleUserEntity.setRoleId(roleId); + + //保存 + insert(sysRoleUserEntity); + } + } + + @Override + public void deleteByRoleIds(Long[] roleIds) { + baseDao.deleteByRoleIds(roleIds); + } + + @Override + public void deleteByUserIds(Long[] userIds) { + baseDao.deleteByUserIds(userIds); + } + + @Override + public List getRoleIdList(Long userId) { + + return baseDao.getRoleIdList(userId); + } + + @Override + public List getUserIdListByRoleId(Long roleId) { + return baseDao.getUserIdsByRoleId(roleId); + } } \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/sys/SysRoleUserDao.xml b/renren-admin/src/main/resources/mapper/sys/SysRoleUserDao.xml index c94854be..b04c02d1 100644 --- a/renren-admin/src/main/resources/mapper/sys/SysRoleUserDao.xml +++ b/renren-admin/src/main/resources/mapper/sys/SysRoleUserDao.xml @@ -1,24 +1,28 @@ - - - - - - - delete from sys_role_user where role_id in - - #{roleId} - - - - - delete from sys_role_user where user_id in - - #{userId} - - - - - + + + + + + + delete from sys_role_user where role_id in + + #{roleId} + + + + + delete from sys_role_user where user_id in + + #{userId} + + + + + + + \ No newline at end of file