diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/friend/ImFriendRequestController.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/friend/ImFriendRequestController.java index 23e84bd..10b2351 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/friend/ImFriendRequestController.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/friend/ImFriendRequestController.java @@ -78,13 +78,13 @@ public class ImFriendRequestController { } @GetMapping("/list") - @Operation(summary = "查询「我相关」的好友申请列表（游标分页：传 lastRequestId 加载更多）") + @Operation(summary = "查询「我相关」的好友申请列表（游标分页：传 maxId 加载更多）") public CommonResult> getMyFriendRequestList( @Parameter(description = "当前列表最旧记录的 id；首页不传") - @RequestParam(value = "lastRequestId", required = false) Long lastRequestId, + @RequestParam(value = "maxId", required = false) Long maxId, @Parameter(description = "单次拉取条数", required = true) @RequestParam("limit") @Min(1) @Max(200) Integer limit) { - List list = friendRequestService.getMyFriendRequestList(getLoginUserId(), lastRequestId, limit); + List list = friendRequestService.getMyFriendRequestList(getLoginUserId(), maxId, limit); return success(buildList(list)); } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/face/ImFacePackItemManagerController.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/face/ImFacePackItemManagerController.java index 68c76f5..4a25431 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/face/ImFacePackItemManagerController.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/face/ImFacePackItemManagerController.java @@ -59,8 +59,8 @@ public class ImFacePackItemManagerController { @Operation(summary = "批量删除表情") @Parameter(name = "ids", description = "编号列表", required = true) @PreAuthorize("@ss.hasPermission('im:manager:face-pack-item:delete')") - public CommonResult deleteFacePackItemList(@RequestParam("ids") - @Size(max = 100, message = "批量删除最多 100 条") List ids) { + public CommonResult deleteFacePackItemList( + @RequestParam("ids") @Size(max = 100, message = "批量删除最多 100 条") List ids) { facePackItemService.deleteFacePackItemList(ids); return success(true); } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapper.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapper.java index 1f7c6a5..e81def0 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapper.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapper.java @@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.im.enums.friend.ImFriendRequestHandleResultEnum; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.ibatis.annotations.Mapper; +import java.time.LocalDateTime; import java.util.List; /** @@ -26,14 +27,19 @@ public interface ImFriendRequestMapper extends BaseMapperX { } /** - * 拉取「我相关」的好友申请列表；游标分页：lastRequestId 为 null 拉首页，非 null 拉 id 严格小于它的下一页 + * 拉取「我相关」的好友申请列表 */ - default List selectMyList(Long userId, Long lastRequestId, int limit) { - // 先放扩展过滤再放双向 OR；否则 .and() 返回 LambdaQueryWrapper 基类，丢失 ltIfPresent 等扩展方法 + default List selectMyList(Long userId, LocalDateTime maxRequestUpdateTime, + Long maxId, int limit) { LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX<>(); - wrapper.ltIfPresent(ImFriendRequestDO::getId, lastRequestId) - .and(w -> w.eq(ImFriendRequestDO::getFromUserId, userId) - .or().eq(ImFriendRequestDO::getToUserId, userId)) + wrapper.and(w -> w.eq(ImFriendRequestDO::getFromUserId, userId) + .or().eq(ImFriendRequestDO::getToUserId, userId)); + if (maxRequestUpdateTime != null && maxId != null) { + wrapper.and(w -> w.lt(ImFriendRequestDO::getUpdateTime, maxRequestUpdateTime) + .or(n -> n.eq(ImFriendRequestDO::getUpdateTime, maxRequestUpdateTime) + .lt(ImFriendRequestDO::getId, maxId))); + } + wrapper.orderByDesc(ImFriendRequestDO::getUpdateTime) .orderByDesc(ImFriendRequestDO::getId) .last("LIMIT " + limit); return selectList(wrapper); @@ -49,7 +55,8 @@ public interface ImFriendRequestMapper extends BaseMapperX { *

* handleContent / handleTime 走 LambdaUpdateWrapper.set 显式置 null，updateById 默认会忽略 null 字段 */ - default int updateByIdReset(Long id, String applyContent, String displayName, Integer addSource) { + default int updateByIdReset(Long id, String applyContent, String displayName, Integer addSource, + LocalDateTime updateTime) { return update(null, new LambdaUpdateWrapper() .eq(ImFriendRequestDO::getId, id) .set(ImFriendRequestDO::getApplyContent, applyContent) @@ -57,7 +64,8 @@ public interface ImFriendRequestMapper extends BaseMapperX { .set(ImFriendRequestDO::getAddSource, addSource) .set(ImFriendRequestDO::getHandleResult, ImFriendRequestHandleResultEnum.UNHANDLED.getResult()) .set(ImFriendRequestDO::getHandleContent, null) - .set(ImFriendRequestDO::getHandleTime, null)); + .set(ImFriendRequestDO::getHandleTime, null) + .set(ImFriendRequestDO::getUpdateTime, updateTime)); } default PageResult selectPage(ImFriendRequestManagerPageReqVO reqVO) { diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMapper.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMapper.java index 26a3619..7f56a1a 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMapper.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMapper.java @@ -15,6 +15,12 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ImGroupMapper extends BaseMapperX { + default ImGroupDO selectByIdForUpdate(Long id) { + return selectOne(new LambdaQueryWrapperX() + .eq(ImGroupDO::getId, id) + .last("FOR UPDATE")); + } + default PageResult selectPage(ImGroupManagerPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ImGroupDO::getName, reqVO.getName()) @@ -25,4 +31,4 @@ public interface ImGroupMapper extends BaseMapperX { .orderByDesc(ImGroupDO::getId)); } -} \ No newline at end of file +} diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMemberMapper.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMemberMapper.java index 7ba35a0..2ef54da 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMemberMapper.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/group/ImGroupMemberMapper.java @@ -45,6 +45,14 @@ public interface ImGroupMemberMapper extends BaseMapperX { .eq(ImGroupMemberDO::getStatus, status)); } + default List selectListByGroupIdAndStatusAndRoles(Long groupId, Integer status, + Collection roles) { + return selectList(new LambdaQueryWrapperX() + .eq(ImGroupMemberDO::getGroupId, groupId) + .eq(ImGroupMemberDO::getStatus, status) + .in(ImGroupMemberDO::getRole, roles)); + } + default List selectListByUserIdAndStatus(Long userId, Integer status) { return selectList(new LambdaQueryWrapperX() .eq(ImGroupMemberDO::getUserId, userId) diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapper.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapper.java index a85fc27..141f6b8 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapper.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapper.java @@ -18,6 +18,8 @@ import java.util.Map; @Mapper public interface ImStatisticsManagerMapper { + String NORMAL_MESSAGE_CONDITION = "type IN (101,102,103,104,105,107,108,115,125) AND status <> 2"; + // ==================== 用户 ==================== /** @@ -39,10 +41,12 @@ public interface ImStatisticsManagerMapper { */ @Select("SELECT COUNT(DISTINCT user_id) FROM (" + " SELECT sender_id AS user_id FROM im_private_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + " UNION ALL " + " SELECT sender_id AS user_id FROM im_group_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + ") t") Long selectActiveUserCount(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); @@ -63,10 +67,12 @@ public interface ImStatisticsManagerMapper { */ @Select("SELECT day AS date, COUNT(DISTINCT user_id) AS count FROM (" + " SELECT DATE(send_time) AS day, sender_id AS user_id FROM im_private_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + " UNION ALL " + " SELECT DATE(send_time) AS day, sender_id AS user_id FROM im_group_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + ") t GROUP BY day") List> selectActiveUserDailyCount(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); @@ -113,7 +119,8 @@ public interface ImStatisticsManagerMapper { * 区间内私聊消息数 */ @Select("SELECT COUNT(*) FROM im_private_message " + - "WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}") + "WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}") Long selectPrivateMessageCount(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); @@ -121,7 +128,8 @@ public interface ImStatisticsManagerMapper { * 区间内群聊消息数 */ @Select("SELECT COUNT(*) FROM im_group_message " + - "WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}") + "WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}") Long selectGroupMessageCount(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); @@ -129,7 +137,8 @@ public interface ImStatisticsManagerMapper { * 区间内每日私聊消息数（按天分组） */ @Select("SELECT DATE(send_time) AS date, COUNT(*) AS count FROM im_private_message " + - "WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime} " + + "WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime} " + "GROUP BY DATE(send_time)") List> selectPrivateMessageDailyCount(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); @@ -138,7 +147,8 @@ public interface ImStatisticsManagerMapper { * 区间内每日群聊消息数（按天分组） */ @Select("SELECT DATE(send_time) AS date, COUNT(*) AS count FROM im_group_message " + - "WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime} " + + "WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime} " + "GROUP BY DATE(send_time)") List> selectGroupMessageDailyCount(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); @@ -150,10 +160,12 @@ public interface ImStatisticsManagerMapper { */ @Select("SELECT type, COUNT(*) AS count FROM (" + " SELECT type FROM im_private_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + " UNION ALL " + " SELECT type FROM im_group_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + ") t GROUP BY type") List> selectMessageTypeDistribution(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); @@ -165,10 +177,12 @@ public interface ImStatisticsManagerMapper { */ @Select("SELECT user_id AS userId, COUNT(*) AS messageCount FROM (" + " SELECT sender_id AS user_id FROM im_private_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + " UNION ALL " + " SELECT sender_id AS user_id FROM im_group_message " + - " WHERE deleted = 0 AND send_time >= #{beginTime} AND send_time < #{endTime}" + + " WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION + + " AND send_time >= #{beginTime} AND send_time < #{endTime}" + ") t GROUP BY user_id ORDER BY messageCount DESC LIMIT #{limit}") List> selectTopSenders(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime, diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/ErrorCodeConstants.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/ErrorCodeConstants.java index d850e2c..eb34dab 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/ErrorCodeConstants.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/ErrorCodeConstants.java @@ -20,7 +20,7 @@ public interface ErrorCodeConstants { ErrorCode MESSAGE_NOT_IN_GROUP = new ErrorCode(1_040_300_009, "消息不属于该群"); ErrorCode MESSAGE_PRIVATE_READ_DISABLED = new ErrorCode(1_040_300_010, "私聊已读功能已关闭"); ErrorCode MESSAGE_GROUP_READ_DISABLED = new ErrorCode(1_040_300_011, "群聊已读功能已关闭"); - ErrorCode MESSAGE_GROUP_READ_USERS_DENIED = new ErrorCode(1_040_300_012, "仅消息发送者可查看已读列表"); + ErrorCode MESSAGE_CONTENT_INVALID = new ErrorCode(1_040_300_013, "消息内容格式不正确"); // ========== 群 (1-040-400-000) ========== ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1_040_400_000, "群不存在"); diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/message/ImMessageTypeEnum.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/message/ImMessageTypeEnum.java index caeccf2..5b1b446 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/message/ImMessageTypeEnum.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/message/ImMessageTypeEnum.java @@ -7,6 +7,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import java.util.Arrays; +import java.util.Set; /** * IM 消息类型枚举 @@ -339,6 +340,27 @@ public enum ImMessageTypeEnum implements ArrayValuable { public static final Integer[] ARRAYS = Arrays.stream(values()).map(ImMessageTypeEnum::getType).toArray(Integer[]::new); + private static final Set FRIEND_NOTIFICATION_TYPES = Set.of( + FRIEND_REQUEST_APPROVED.type, + FRIEND_REQUEST_REJECTED.type, + FRIEND_REQUEST_RECEIVED.type, + FRIEND_ADD.type, + FRIEND_DELETE.type, + FRIEND_BLOCK.type, + FRIEND_UNBLOCK.type, + FRIEND_INFO_UPDATED.type, + FRIEND_UPDATE.type); + + private static final Set GROUP_REQUEST_NOTIFICATION_TYPES = Set.of( + GROUP_REQUEST_RECEIVED.type, + GROUP_REQUEST_APPROVED.type, + GROUP_REQUEST_REJECTED.type); + + private static final Set RTC_NOTIFICATION_TYPES = Set.of( + RTC_CALL.type, + RTC_PARTICIPANT_CONNECTED.type, + RTC_PARTICIPANT_DISCONNECTED.type); + /** * 类型 */ @@ -379,4 +401,25 @@ public enum ImMessageTypeEnum implements ArrayValuable { return result; } + /** + * 判断是否为好友通知 + */ + public static boolean isFriendNotification(Integer type) { + return type != null && FRIEND_NOTIFICATION_TYPES.contains(type); + } + + /** + * 判断是否为群申请定向通知 + */ + public static boolean isGroupRequestNotification(Integer type) { + return type != null && GROUP_REQUEST_NOTIFICATION_TYPES.contains(type); + } + + /** + * 判断是否为通话信令通知 + */ + public static boolean isRtcNotification(Integer type) { + return type != null && RTC_NOTIFICATION_TYPES.contains(type); + } + } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/mq/consumer/friend/AdminUserProfileUpdateConsumer.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/mq/consumer/friend/AdminUserProfileUpdateConsumer.java index 7ef83a3..b39ce13 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/mq/consumer/friend/AdminUserProfileUpdateConsumer.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/mq/consumer/friend/AdminUserProfileUpdateConsumer.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.im.mq.consumer.friend; +import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.module.im.dal.dataobject.friend.ImFriendDO; import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum; import cn.iocoder.yudao.module.im.service.friend.ImFriendService; @@ -33,22 +34,36 @@ public class AdminUserProfileUpdateConsumer { @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = true) @Async // Spring Event 默认在 Producer 发送的线程，通过 @Async 实现异步；事务提交后触发，避免回滚误推幽灵通知 / Consumer 抢在 commit 前读旧值 public void onMessage(AdminUserProfileUpdateMessage message) { - log.info("[onMessage][消息内容({})]", message); - Long userId = message.getUserId(); - // 1. 过滤双向有效好友 - List friends = friendService.getMutualEnableFriendList(userId); - if (friends.isEmpty()) { - return; - } + try { + log.info("[onMessage][消息内容({})]", message); + // 1. 过滤双向有效好友 + if (message == null || message.getUserId() == null) { + return; + } + Long userId = message.getUserId(); + List friends = friendService.getMutualEnableFriendList(userId); + if (CollUtil.isEmpty(friends)) { + return; + } - // 2. 给每个好友的多端推 FRIEND_INFO_UPDATED；payload 里 operatorUserId / friendUserId 都是「资料被改的人」 - for (ImFriendDO friend : friends) { - FriendInfoUpdatedNotification payload = (FriendInfoUpdatedNotification) new FriendInfoUpdatedNotification() - .setOperatorUserId(userId).setFriendUserId(userId); - websocketService.sendPrivateMessageAsync(friend.getFriendUserId(), ImPrivateMessageDTO.ofFriendNotification( - ImMessageTypeEnum.FRIEND_INFO_UPDATED.getType(), userId, friend.getFriendUserId(), payload)); + // 2. 给每个好友的多端推 FRIEND_INFO_UPDATED；payload 里 operatorUserId / friendUserId 都是「资料被改的人」 + int successCount = 0; + for (ImFriendDO friend : friends) { + try { + FriendInfoUpdatedNotification payload = (FriendInfoUpdatedNotification) new FriendInfoUpdatedNotification() + .setOperatorUserId(userId).setFriendUserId(userId); + websocketService.sendPrivateMessageAsync(friend.getFriendUserId(), ImPrivateMessageDTO.ofFriendNotification( + ImMessageTypeEnum.FRIEND_INFO_UPDATED.getType(), userId, friend.getFriendUserId(), payload)); + successCount++; + } catch (Exception e) { + log.warn("[onMessage][userId({}) friendUserId({}) 推送失败]", + userId, friend.getFriendUserId(), e); + } + } + log.info("[onMessage][userId({}) 推送 FRIEND_INFO_UPDATED 给 {} 位好友]", userId, successCount); + } catch (Exception e) { + log.error("[onMessage][消息内容({}) 处理失败]", message, e); } - log.info("[onMessage][userId({}) 推送 FRIEND_INFO_UPDATED 给 {} 位好友]", userId, friends.size()); } } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestService.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestService.java index e914f3b..a78bb38 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestService.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestService.java @@ -41,14 +41,14 @@ public interface ImFriendRequestService { void refuseFriendRequest(Long userId, Long requestId, String handleContent); /** - * 查询「我相关」的申请列表（含我发起的、别人加我的）；游标分页：传 lastRequestId 拉它之前的下一页 + * 查询「我相关」的申请列表（含我发起的、别人加我的）；游标分页：传 maxId 拉更早一页 * - * @param userId 用户编号 - * @param lastRequestId 当前列表最旧记录的 id；首页传 null - * @param limit 单次拉取条数（page size，由前端常量控制） - * @return 申请记录列表，按 id 倒序 + * @param userId 用户编号 + * @param maxId 当前列表最旧记录的 id；首页传 null + * @param limit 单次拉取条数（page size，由前端常量控制） + * @return 申请记录列表，按更新时间、id 倒序 */ - List getMyFriendRequestList(Long userId, Long lastRequestId, Integer limit); + List getMyFriendRequestList(Long userId, Long maxId, Integer limit); /** * 按 id 单查申请记录；通用读接口，调用方自行做越权过滤 diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java index 081720e..39f6423 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java @@ -95,12 +95,13 @@ public class ImFriendRequestServiceImpl implements ImFriendRequestService { // 2. 落库：upsert 语义；同一对 (from, to) 唯一，已有记录覆盖申请理由 / 备注 / 来源 + 重置为未处理 + 清空旧处理痕迹 ImFriendRequestDO request = friendRequestMapper.selectByFromUserIdAndToUserId(fromUserId, toUserId); if (request != null) { + LocalDateTime now = LocalDateTime.now(); friendRequestMapper.updateByIdReset(request.getId(), - reqVO.getApplyContent(), reqVO.getDisplayName(), reqVO.getAddSource()); + reqVO.getApplyContent(), reqVO.getDisplayName(), reqVO.getAddSource(), now); request.setApplyContent(reqVO.getApplyContent()).setDisplayName(reqVO.getDisplayName()) .setAddSource(reqVO.getAddSource()) .setHandleResult(ImFriendRequestHandleResultEnum.UNHANDLED.getResult()) - .setHandleContent(null).setHandleTime(null); + .setHandleContent(null).setHandleTime(null).setUpdateTime(now); } else { request = BeanUtils.toBean(reqVO, ImFriendRequestDO.class) .setFromUserId(fromUserId).setToUserId(toUserId) @@ -195,8 +196,15 @@ public class ImFriendRequestServiceImpl implements ImFriendRequestService { } @Override - public List getMyFriendRequestList(Long userId, Long lastRequestId, Integer limit) { - return friendRequestMapper.selectMyList(userId, lastRequestId, limit); + public List getMyFriendRequestList(Long userId, Long maxId, Integer limit) { + ImFriendRequestDO maxRequest = maxId != null ? friendRequestMapper.selectById(maxId) : null; + if (maxId != null && maxRequest == null) { + return List.of(); + } + return friendRequestMapper.selectMyList(userId, + maxRequest != null ? maxRequest.getUpdateTime() : null, + maxRequest != null ? maxRequest.getId() : null, + limit); } @Override diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberService.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberService.java index 2b4374f..d9a8000 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberService.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberService.java @@ -185,7 +185,7 @@ public interface ImGroupMemberService { * @param userIds 用户编号集合 * @param role 新角色，见 {@link cn.iocoder.yudao.module.im.enums.group.ImGroupMemberRoleEnum} */ - void updateGroupMemberRole(Long groupId, Collection userIds, Integer role); + int updateGroupMemberRole(Long groupId, Collection userIds, Integer role); /** * 统计群内指定 role 的活跃成员数量 diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImpl.java index 7242919..523841e 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImpl.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImpl.java @@ -76,14 +76,9 @@ public class ImGroupMemberServiceImpl implements ImGroupMemberService { @Override public List getGroupMemberListByOwnerAndAdmin(Long groupId) { - // TODO @AI：把条件往下传；这样减少加载数据量！ - List members = getActiveGroupMemberListByGroupId(groupId); - if (CollUtil.isEmpty(members)) { - return Collections.emptyList(); - } - return members.stream() - .filter(member -> ImGroupMemberRoleEnum.isOwnerOrAdmin(member.getRole())) - .toList(); + // TODO DONE @AI：把条件往下传；这样减少加载数据量！ + return groupMemberMapper.selectListByGroupIdAndStatusAndRoles(groupId, CommonStatusEnum.ENABLE.getStatus(), + List.of(ImGroupMemberRoleEnum.OWNER.getRole(), ImGroupMemberRoleEnum.ADMIN.getRole())); } /** @@ -239,11 +234,11 @@ public class ImGroupMemberServiceImpl implements ImGroupMemberService { } @Override - public void updateGroupMemberRole(Long groupId, Collection userIds, Integer role) { + public int updateGroupMemberRole(Long groupId, Collection userIds, Integer role) { if (CollUtil.isEmpty(userIds)) { - return; + return 0; } - groupMemberMapper.updateListByGroupIdAndUserIds(groupId, userIds, new ImGroupMemberDO().setRole(role)); + return groupMemberMapper.updateListByGroupIdAndUserIds(groupId, userIds, new ImGroupMemberDO().setRole(role)); } @Override diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java index 2fc6c0a..527c5a1 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java @@ -319,7 +319,7 @@ public class ImGroupServiceImpl implements ImGroupService { Long groupId = reqVO.getGroupId(); Set targetUserIds = new HashSet<>(reqVO.getUserIds()); // 1.1 仅群主可操作 - validateGroupOwner(groupId, userId); + validateGroupOwnerForUpdate(groupId, userId); // 1.2 校验目标都是有效成员且非群主 Map targetMap = convertMap( groupMemberService.getGroupMembers(groupId, targetUserIds), ImGroupMemberDO::getUserId); @@ -340,7 +340,11 @@ public class ImGroupServiceImpl implements ImGroupService { } // 2. 批量更新角色 - groupMemberService.updateGroupMemberRole(groupId, changedUserIds, ImGroupMemberRoleEnum.ADMIN.getRole()); + int affected = groupMemberService.updateGroupMemberRole(groupId, changedUserIds, + ImGroupMemberRoleEnum.ADMIN.getRole()); + if (affected != changedUserIds.size()) { + throw exception(GROUP_ADMIN_TARGET_NOT_IN_GROUP); + } // 3. 推送 GROUP_ADMIN_ADD 通知给全员 groupMessageService.sendGroupMessage(userId, @@ -353,7 +357,7 @@ public class ImGroupServiceImpl implements ImGroupService { Long groupId = reqVO.getGroupId(); Set targetUserIds = new HashSet<>(reqVO.getUserIds()); // 1.1 仅群主可操作 - validateGroupOwner(groupId, userId); + validateGroupOwnerForUpdate(groupId, userId); // 1.2 校验目标都是有效成员且非群主 Map targetMap = convertMap( groupMemberService.getGroupMembers(groupId, targetUserIds), ImGroupMemberDO::getUserId); @@ -367,7 +371,11 @@ public class ImGroupServiceImpl implements ImGroupService { } // 2. 批量更新角色 - groupMemberService.updateGroupMemberRole(groupId, changedUserIds, ImGroupMemberRoleEnum.NORMAL.getRole()); + int affected = groupMemberService.updateGroupMemberRole(groupId, changedUserIds, + ImGroupMemberRoleEnum.NORMAL.getRole()); + if (affected != changedUserIds.size()) { + throw exception(GROUP_ADMIN_TARGET_NOT_IN_GROUP); + } // 3. 推送 GROUP_ADMIN_REMOVE 通知给全员 groupMessageService.sendGroupMessage(userId, @@ -396,7 +404,7 @@ public class ImGroupServiceImpl implements ImGroupService { Long groupId = transferReqVO.getGroupId(); Long newOwnerUserId = transferReqVO.getNewOwnerUserId(); // 1.1 仅老群主可执行 - validateGroupOwner(groupId, userId); + validateGroupOwnerForUpdate(groupId, userId); // 1.2 不能转让给自己 if (ObjUtil.equal(userId, newOwnerUserId)) { throw exception(GROUP_TRANSFER_OWNER_TO_SELF); @@ -404,11 +412,19 @@ public class ImGroupServiceImpl implements ImGroupService { // 1.3 新群主必须是群的有效成员 ImGroupMemberDO newOwner = groupMemberService.validateMemberInGroup(groupId, newOwnerUserId); - // 2.1 更新群表 owner_user_id + // 2.1 更新成员角色 + int newOwnerAffected = groupMemberService.updateGroupMemberRole(groupId, Set.of(newOwner.getUserId()), + ImGroupMemberRoleEnum.OWNER.getRole()); + if (newOwnerAffected != 1) { + throw exception(GROUP_MEMBER_NOT_IN_GROUP); + } + int oldOwnerAffected = groupMemberService.updateGroupMemberRole(groupId, Set.of(userId), + ImGroupMemberRoleEnum.NORMAL.getRole()); + if (oldOwnerAffected != 1) { + throw exception(GROUP_MEMBER_NOT_IN_GROUP); + } + // 2.2 更新群主编号 groupMapper.updateById(new ImGroupDO().setId(groupId).setOwnerUserId(newOwnerUserId)); - // 2.2 旧群主 role → MEMBER；新群主 role → OWNER - groupMemberService.updateGroupMemberRole(groupId, Set.of(userId), ImGroupMemberRoleEnum.NORMAL.getRole()); - groupMemberService.updateGroupMemberRole(groupId, Set.of(newOwner.getUserId()), ImGroupMemberRoleEnum.OWNER.getRole()); // 3. 推送 GROUP_OWNER_TRANSFER 通知给全员 groupMessageService.sendGroupMessage(userId, @@ -420,7 +436,7 @@ public class ImGroupServiceImpl implements ImGroupService { @Transactional(rollbackFor = Exception.class) public void pinGroupMessage(Long userId, Long groupId, Long messageId) { // 1.1 校验群主 / 管理员；同时拿到 group 复用，避免再走一次 @Cacheable - ImGroupDO group = validateOwnerOrAdminAndGetGroup(groupId, userId); + ImGroupDO group = validateOwnerOrAdminAndGetGroupForUpdate(groupId, userId); // 1.2 校验消息属于该群、是普通聊天消息（绕过前端菜单不允许置顶群事件 / 撤回事件）、且未被撤回 ImGroupMessageDO message = groupMessageService.getGroupMessage(messageId); if (message == null || ObjUtil.notEqual(message.getGroupId(), groupId)) { @@ -457,7 +473,7 @@ public class ImGroupServiceImpl implements ImGroupService { @Transactional(rollbackFor = Exception.class) public void unpinGroupMessage(Long userId, Long groupId, Long messageId) { // 1. 校验群主 / 管理员；同时拿到 group 复用，避免再走一次 @Cacheable - ImGroupDO group = validateOwnerOrAdminAndGetGroup(groupId, userId); + ImGroupDO group = validateOwnerOrAdminAndGetGroupForUpdate(groupId, userId); // 2. 幂等校验 List pinned = new ArrayList<>(CollUtil.emptyIfNull(group.getPinnedMessageIds())); if (!pinned.contains(messageId)) { @@ -471,7 +487,9 @@ public class ImGroupServiceImpl implements ImGroupService { ImGroupMessageSendDTO.ofGroupMessageUnpin(groupId, userId, messageId)); } - /** 校验登录用户是群主 / 管理员，同时返回 group（复用 validateGroupExists 的查询，避免调用方再查一次） */ + /** + * 校验登录用户是群主或管理员，同时返回群信息 + */ private ImGroupDO validateOwnerOrAdminAndGetGroup(Long groupId, Long userId) { ImGroupDO group = validateGroupExists(groupId); ImGroupMemberDO member = groupMemberService.validateMemberInGroup(groupId, userId); @@ -481,6 +499,18 @@ public class ImGroupServiceImpl implements ImGroupService { return group; } + /** + * 校验登录用户是群主或管理员，同时锁定群信息 + */ + private ImGroupDO validateOwnerOrAdminAndGetGroupForUpdate(Long groupId, Long userId) { + ImGroupDO group = validateGroupExistsForUpdate(groupId); + ImGroupMemberDO member = groupMemberService.validateMemberInGroup(groupId, userId); + if (!ImGroupMemberRoleEnum.isOwnerOrAdmin(member.getRole())) { + throw exception(GROUP_NOT_OWNER_OR_ADMIN); + } + return group; + } + // ==================== 群的读操作 ==================== @Override @@ -498,9 +528,11 @@ public class ImGroupServiceImpl implements ImGroupService { return group; } - // todo @AI：这个是不是可以放到 groupmemberservice 里面？ @Override public void validateMemberCountLimit(Long groupId, int addCount) { + // 1. 锁定群记录 + validateGroupExistsForUpdate(groupId); + // 2. 校验成员数量上限 int activeCount = groupMemberService.getActiveGroupMemberUserIdsByGroupId(groupId).size(); int maxMember = imProperties.getGroup().getMaxMember(); if (activeCount + addCount > maxMember) { @@ -508,18 +540,28 @@ public class ImGroupServiceImpl implements ImGroupService { } } - /** - * 校验当前用户是群主，否则抛 GROUP_NOT_OWNER - */ - @SuppressWarnings("UnusedReturnValue") - private ImGroupDO validateGroupOwner(Long groupId, Long userId) { - ImGroupDO group = validateGroupExists(groupId); + private ImGroupDO validateGroupOwnerForUpdate(Long groupId, Long userId) { + ImGroupDO group = validateGroupExistsForUpdate(groupId); if (ObjUtil.notEqual(group.getOwnerUserId(), userId)) { throw exception(GROUP_NOT_OWNER); } return group; } + private ImGroupDO validateGroupExistsForUpdate(Long groupId) { + ImGroupDO group = groupMapper.selectByIdForUpdate(groupId); + if (group == null) { + throw exception(GROUP_NOT_EXISTS); + } + if (Boolean.TRUE.equals(group.getBanned())) { + throw exception(GROUP_BANNED); + } + if (CommonStatusEnum.DISABLE.getStatus().equals(group.getStatus())) { + throw exception(GROUP_DISSOLVED); + } + return group; + } + private ImGroupDO validateGroupNotDissolved(Long id) { ImGroupDO group = getSelf().getGroup(id); if (group == null) { diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImpl.java index e85f6fe..7291bde 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImpl.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImpl.java @@ -91,12 +91,14 @@ public class ImGroupMessageServiceImpl implements ImGroupMessageService { senderId, reqVO.getClientMessageId(), existing.getId()); return existing; } - // 1.2 校验群存在、发送人仍在群中 + // 1.2 消息内容校验 + ImMessageUtils.validateUserMessageContent(reqVO.getType(), reqVO.getContent()); + // 1.3 校验群存在、发送人仍在群中 ImGroupDO group = groupService.validateGroupExists(reqVO.getGroupId()); ImGroupMemberDO senderMember = groupMemberService.validateMemberInGroup(reqVO.getGroupId(), senderId); - // 1.3 禁言校验 + // 1.4 禁言校验 validateMuteStatus(group, senderMember); - // 1.4 文本消息敏感词过滤 + // 1.5 文本消息敏感词过滤 if (ImMessageTypeEnum.TEXT.getType().equals(reqVO.getType())) { sensitiveWordService.validateText(reqVO.getContent()); } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImPrivateMessageServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImPrivateMessageServiceImpl.java index 1ac9600..cd83a2d 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImPrivateMessageServiceImpl.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImPrivateMessageServiceImpl.java @@ -69,9 +69,11 @@ public class ImPrivateMessageServiceImpl implements ImPrivateMessageService { senderId, reqVO.getClientMessageId(), existing.getId()); return existing; } - // 1.2 好友校验 + // 1.2 消息内容校验 + ImMessageUtils.validateUserMessageContent(reqVO.getType(), reqVO.getContent()); + // 1.3 好友校验 friendService.validateFriend(senderId, reqVO.getReceiverId()); - // 1.3 文本消息敏感词过滤 + // 1.4 文本消息敏感词过滤 if (ImMessageTypeEnum.TEXT.getType().equals(reqVO.getType())) { sensitiveWordService.validateText(reqVO.getContent()); } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/rtc/ImRtcCallServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/rtc/ImRtcCallServiceImpl.java index 0b8517d..c2a967a 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/rtc/ImRtcCallServiceImpl.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/rtc/ImRtcCallServiceImpl.java @@ -38,6 +38,7 @@ import jakarta.annotation.Resource; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.time.Duration; @@ -100,6 +101,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { @Override @SneakyThrows + @Transactional(rollbackFor = Exception.class) public ImRtcCallDO createCall(Long userId, ImRtcCallCreateReqVO reqVO) { validateEnabled(); // 1. 校验入参与场景 @@ -176,6 +178,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { @Override @SneakyThrows + @Transactional(rollbackFor = Exception.class) public void inviteCall(Long userId, ImRtcCallInviteReqVO reqVO) { validateEnabled(); // 1.1 校验通话存在且活跃 @@ -242,6 +245,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public ImRtcCallDO joinCall(Long userId, String room) { validateEnabled(); // 1.1 校验通话存在且活跃 @@ -312,6 +316,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public ImRtcCallDO acceptCall(Long userId, String room) { validateEnabled(); // 1.1 校验通话存在且活跃 @@ -341,6 +346,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public void rejectCall(Long userId, String room) { validateEnabled(); // 1.1 校验通话存在且活跃 @@ -370,6 +376,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public void cancelCall(Long userId, String room) { validateEnabled(); // 1.1 校验通话存在且活跃 @@ -388,6 +395,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public void leaveCall(Long userId, String room) { validateEnabled(); // 1.1 校验通话存在且活跃 @@ -397,11 +405,19 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { // 2. 当前状态 → LEFT；条件 UPDATE 防并发反复改 LocalDateTime now = LocalDateTime.now(); - rtcParticipantMapper.updateByIdAndStatus(participant.getId(), participant.getStatus(), + int updated = rtcParticipantMapper.updateByIdAndStatus(participant.getId(), participant.getStatus(), new ImRtcParticipantDO().setId(participant.getId()).setStatus(ImRtcParticipantStatusEnum.LEFT.getStatus()).setLeaveTime(now)); + if (updated == 0) { + return; + } - // 3. 触发关房判定：私聊任一方离开必关；群通话仅在「无人在房 + 无人响铃」时关 - // 群通话单人离开：LiveKit `ParticipantDisconnected` 自动通知房内成员；业务后端不另外推 + // 3. 群通话已入会参与者离开时推送离线通知 + if (ImConversationTypeEnum.isGroup(call.getConversationType()) + && ImRtcParticipantStatusEnum.isJoined(participant.getStatus())) { + pushParticipantDisconnectedNotification(call, userId); + } + + // 4. 触发关房判定：私聊任一方离开必关；群通话仅在「无人在房 + 无人响铃」时关 endSessionIfTerminal(call, userId); } @@ -474,10 +490,17 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { @Override public String signCallToken(Long userId, String room) { + validateEnabled(); + ImRtcCallDO call = validateCallActive(room); + ImRtcParticipantDO participant = validateParticipant(call, userId); + if (!ImRtcParticipantStatusEnum.isJoined(participant.getStatus())) { + throw exception(RTC_NOT_PARTICIPANT); + } return signToken(userId, resolveDisplayName(adminUserApi.getUser(userId), userId), room); } @Override + @Transactional(rollbackFor = Exception.class) public void handleLiveKitEvent(LiveKitWebhookEventDTO event) { if (event == null || event.getEvent() == null) { return; @@ -580,6 +603,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public int cleanupZombieCalls(int thresholdMinutes) { // 阈值由调用方（Job）保证 > 0；低于 1 分钟会误杀刚发起的合理零人态 LocalDateTime threshold = LocalDateTime.now().minusMinutes(thresholdMinutes); @@ -610,6 +634,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public int timeoutInvitingParticipants(int thresholdMinutes) { // 阈值由调用方（Job）保证 > 0；低于 1 分钟可能误杀刚发起还在响铃的合理 INVITING 态 LocalDateTime threshold = LocalDateTime.now().minusMinutes(thresholdMinutes); @@ -618,6 +643,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService { } @Override + @Transactional(rollbackFor = Exception.class) public void noAnswerCallCheck(Long userId, String room) { // 鉴权：仅该 room 参与者可触发；失败静默，不暴露错误 ImRtcParticipantDO operator = rtcParticipantMapper.selectByRoomAndUserId(room, userId); diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketService.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketService.java index c298e7d..aedcfd3 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketService.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketService.java @@ -10,7 +10,7 @@ import java.util.Collections; /** * IM WebSocket 推送 Service 接口 *

- * 统一封装 WebSocket 消息推送，所有方法默认异步执行。 + * 统一封装 WebSocket 消息推送，事务内调用时提交后异步执行。 * * @author 芋道源码 */ @@ -27,9 +27,9 @@ public interface ImWebSocketService { } /** - * 异步批量推送私聊消息给多个用户；用于一条 payload 扇出到多个收件人 + * 异步批量推送私聊消息给多个用户；用于同一份 DTO 扇出到多个收件人 *

- * 相比逐个 sendPrivateMessageAsync，仅注册一个 afterCommit 回调 + 一个 @Async 任务，大群参与者事件（1602 / 1603）下避免 N 次线程池调度 + * 相比逐个发送，仅注册一次 afterCommit 回调和异步任务。 * * @param userIds 目标用户编号列表 * @param dto 私聊消息 DTO diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java index 8b33b64..2bf3222 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java @@ -37,7 +37,7 @@ public class ImWebSocketServiceImpl implements ImWebSocketService { @Override public void sendPrivateMessageAsync(Collection userIds, ImPrivateMessageDTO dto) { - // 说明：通过 executeAfterCommitOrNow 保证事务提交后再推送，避免客户端收到消息后查询数据库时事务尚未提交 + // 说明：通过 executeAfterTransaction 保证事务提交后再推送，避免客户端收到消息后查询数据库时事务尚未提交 // 通过 getSelf() 获取 Spring 代理对象调用 @Async 方法，确保异步 AOP 生效（直接 this 调用会绕过代理） executeAfterTransaction(() -> getSelf().doSendPrivateMessage(userIds, dto)); } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImGroupMessageDTO.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImGroupMessageDTO.java index 9a9a72c..254df98 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImGroupMessageDTO.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImGroupMessageDTO.java @@ -73,6 +73,10 @@ public class ImGroupMessageDTO { * 群回执已读人数 */ private Integer readCount; + /** + * 已读位置 + */ + private Long readId; // ========== 静态工厂方法 ========== @@ -96,7 +100,7 @@ public class ImGroupMessageDTO { */ public static ImGroupMessageDTO ofRead(Long senderId, Long groupId, Long readId) { return new ImGroupMessageDTO() - .setId(readId).setType(ImMessageTypeEnum.READ.getType()) + .setId(readId).setReadId(readId).setType(ImMessageTypeEnum.READ.getType()) .setSenderId(senderId).setGroupId(groupId); } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImPrivateMessageDTO.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImPrivateMessageDTO.java index 7f2c7e4..7c708d9 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImPrivateMessageDTO.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/dto/ImPrivateMessageDTO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.im.service.websocket.dto; +import cn.hutool.core.lang.Assert; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.im.dal.dataobject.message.ImPrivateMessageDO; @@ -116,6 +117,7 @@ public class ImPrivateMessageDTO { */ public static ImPrivateMessageDTO ofFriendNotification(Integer type, Long operatorUserId, Long receiverUserId, BaseFriendNotification payload) { + validateNotification(type, payload, ImMessageTypeEnum.isFriendNotification(type)); return new ImPrivateMessageDTO().setType(type) .setSenderId(operatorUserId).setReceiverId(receiverUserId) .setContent(JsonUtils.toJsonString(payload)).setSendTime(LocalDateTime.now()); @@ -123,7 +125,7 @@ public class ImPrivateMessageDTO { // ==================== 群定向私聊通知 ==================== - // TODO @AI：能不能走群聊的通道？？？？只是接收人不同。【统一优化的】 + // TODO DONE @AI：群申请定向通知继续走私聊通道 /** * 构建群通知推送 DTO（走私聊通道定向推送，不入群消息流） *

@@ -138,6 +140,7 @@ public class ImPrivateMessageDTO { */ public static ImPrivateMessageDTO ofGroupNotification(Integer type, Long operatorUserId, Long receiverUserId, BaseGroupNotification payload) { + validateNotification(type, payload, ImMessageTypeEnum.isGroupRequestNotification(type)); return new ImPrivateMessageDTO().setType(type) .setSenderId(operatorUserId).setReceiverId(receiverUserId) .setContent(JsonUtils.toJsonString(payload)).setSendTime(LocalDateTime.now()); @@ -145,7 +148,6 @@ public class ImPrivateMessageDTO { // ==================== 实时通话信令 ==================== - // TODO @AI：能不能走群聊的通道？？？？只是接收人不同。【统一优化的】 /** * 构建通话信令推送 DTO（走私聊通道仅推参与方，不入消息流） *

@@ -159,9 +161,16 @@ public class ImPrivateMessageDTO { */ public static ImPrivateMessageDTO ofRtcNotification(Integer type, Long senderId, Long receiverUserId, Object payload) { + validateNotification(type, payload, ImMessageTypeEnum.isRtcNotification(type)); return new ImPrivateMessageDTO().setType(type) .setSenderId(senderId).setReceiverId(receiverUserId) .setContent(JsonUtils.toJsonString(payload)).setSendTime(LocalDateTime.now()); } + private static void validateNotification(Integer type, Object payload, boolean supported) { + Assert.notNull(type, "消息类型不能为空"); + Assert.notNull(payload, "消息内容不能为空"); + Assert.isTrue(supported, "消息类型不匹配 type={}", type); + } + } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/util/ImMessageUtils.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/util/ImMessageUtils.java index 2b5af54..389f140 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/util/ImMessageUtils.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/util/ImMessageUtils.java @@ -1,19 +1,152 @@ package cn.iocoder.yudao.module.im.util; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; +import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum; import cn.iocoder.yudao.module.im.service.websocket.dto.message.QuoteMessage; +import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.MESSAGE_CONTENT_INVALID; + /** * IM 消息内容相关工具类 */ public class ImMessageUtils { /** + * 文本消息最大长度 + */ + private static final int TEXT_MAX_LENGTH = 4096; + /** + * URL 最大长度 + */ + private static final int URL_MAX_LENGTH = 2048; + /** + * 合并消息最大条数 + */ + private static final int MERGE_MESSAGE_MAX_COUNT = 100; + + /** + * 校验用户发送的消息内容 + * + * @param type 消息类型 + * @param content 消息内容 + */ + public static void validateUserMessageContent(Integer type, String content) { + ImMessageTypeEnum messageType; + try { + messageType = ImMessageTypeEnum.validate(type); + } catch (IllegalArgumentException e) { + throw exception(MESSAGE_CONTENT_INVALID); + } + if (!messageType.isNormal()) { + throw exception(MESSAGE_CONTENT_INVALID); + } + Map map = JsonUtils.parseMap(content); + if (map == null) { + throw exception(MESSAGE_CONTENT_INVALID); + } + if (ImMessageTypeEnum.TEXT == messageType) { + validateTextContent(map); + } else if (ImMessageTypeEnum.IMAGE == messageType || ImMessageTypeEnum.FACE == messageType) { + validateUrl(getString(map, "url")); + } else if (ImMessageTypeEnum.VOICE == messageType) { + validateUrl(getString(map, "url")); + validatePositiveNumber(map.get("duration")); + } else if (ImMessageTypeEnum.VIDEO == messageType) { + validateUrl(getString(map, "url")); + } else if (ImMessageTypeEnum.FILE == messageType) { + validateUrl(getString(map, "url")); + validateNotBlank(getString(map, "name")); + } else if (ImMessageTypeEnum.CARD == messageType) { + validateCardContent(map); + } else if (ImMessageTypeEnum.MERGE == messageType) { + validateMergeContent(map); + } else if (ImMessageTypeEnum.MATERIAL == messageType) { + validateMaterialContent(map); + } + } + + private static void validateTextContent(Map map) { + String text = getString(map, "content"); + validateNotBlank(text); + if (text.length() > TEXT_MAX_LENGTH) { + throw exception(MESSAGE_CONTENT_INVALID); + } + } + + private static void validateCardContent(Map map) { + validateNumber(map.get("targetType")); + validateNumber(map.get("targetId")); + validateNotBlank(getString(map, "name")); + } + + private static void validateMergeContent(Map map) { + validateNotBlank(getString(map, "title")); + Object messages = map.get("messages"); + if (!(messages instanceof Collection messageList) + || CollUtil.isEmpty(messageList) + || messageList.size() > MERGE_MESSAGE_MAX_COUNT) { + throw exception(MESSAGE_CONTENT_INVALID); + } + } + + private static void validateMaterialContent(Map map) { + if (map.get("materialId") == null && StrUtil.isBlank(getString(map, "title"))) { + throw exception(MESSAGE_CONTENT_INVALID); + } + validateUrlIfPresent(getString(map, "url")); + validateUrlIfPresent(getString(map, "coverUrl")); + } + + private static String getString(Map map, String field) { + return Convert.toStr(map.get(field), null); + } + + private static void validateNotBlank(String value) { + if (StrUtil.isBlank(value)) { + throw exception(MESSAGE_CONTENT_INVALID); + } + } + + private static void validateNumber(Object value) { + if (Convert.toLong(value, null) == null) { + throw exception(MESSAGE_CONTENT_INVALID); + } + } + + private static void validatePositiveNumber(Object value) { + Integer number = Convert.toInt(value, null); + if (number == null || number < 0) { + throw exception(MESSAGE_CONTENT_INVALID); + } + } + + private static void validateUrlIfPresent(String url) { + if (StrUtil.isBlank(url)) { + return; + } + validateUrl(url); + } + + private static void validateUrl(String url) { + validateNotBlank(url); + if (url.length() > URL_MAX_LENGTH) { + throw exception(MESSAGE_CONTENT_INVALID); + } + String lowerUrl = StrUtil.trim(url).toLowerCase(); + if (StrUtil.startWithAny(lowerUrl, "javascript:", "data:", "vbscript:", "file:")) { + throw exception(MESSAGE_CONTENT_INVALID); + } + } + + /** * 从 content 解析客户端写入的 quote.messageId * * @param content 原 content(JSON) diff --git a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapperTest.java b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapperTest.java index b2b8d5b..ed354df 100644 --- a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapperTest.java +++ b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/friend/ImFriendRequestMapperTest.java @@ -29,8 +29,8 @@ public class ImFriendRequestMapperTest extends BaseDbUnitTest { mapper.insert(buildRequest(2L, 1L)); mapper.insert(buildRequest(3L, 4L)); - // 调用：lastRequestId=null 拉首页 - List list = mapper.selectMyList(1L, null, 10); + // 调用：cursor 为空，拉首页 + List list = mapper.selectMyList(1L, null, null, 10); // 断言：双向 OR 命中两条，无关用户被排除 assertEquals(2, list.size()); @@ -47,8 +47,9 @@ public class ImFriendRequestMapperTest extends BaseDbUnitTest { mapper.insert(r2); mapper.insert(r3); - // 调用：lastRequestId = r3.id，拉 id < r3.id 的下一页 - List next = mapper.selectMyList(1L, r3.getId(), 10); + // 调用：cursor = r3，拉比 r3 更早的下一页 + ImFriendRequestDO cursor = mapper.selectById(r3.getId()); + List next = mapper.selectMyList(1L, cursor.getUpdateTime(), cursor.getId(), 10); // 断言：仅含 r1 / r2，按 id 倒序 assertEquals(2, next.size()); @@ -64,7 +65,7 @@ public class ImFriendRequestMapperTest extends BaseDbUnitTest { } // 调用：limit = 2 - List list = mapper.selectMyList(1L, null, 2); + List list = mapper.selectMyList(1L, null, null, 2); // 断言：手写 LIMIT 真生效 assertEquals(2, list.size()); diff --git a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/face/ImFacePackItemServiceImplTest.java b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/face/ImFacePackItemServiceImplTest.java index 448d2b1..d585074 100644 --- a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/face/ImFacePackItemServiceImplTest.java +++ b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/face/ImFacePackItemServiceImplTest.java @@ -156,9 +156,22 @@ public class ImFacePackItemServiceImplTest extends BaseMockitoUnitTest { @Test public void testDeleteFacePackItemList_success() { - service.deleteFacePackItemList(Arrays.asList(1L, 2L)); + List ids = Arrays.asList(1L, 2L); + when(facePackItemMapper.deleteByIds(ids)).thenReturn(2); - verify(facePackItemMapper).deleteByIds(Arrays.asList(1L, 2L)); + service.deleteFacePackItemList(ids); + + verify(facePackItemMapper).deleteByIds(ids); + } + + @Test + public void testDeleteFacePackItemList_ignoreMissingIds() { + List ids = Arrays.asList(1L, 2L); + when(facePackItemMapper.deleteByIds(ids)).thenReturn(1); + + service.deleteFacePackItemList(ids); + + verify(facePackItemMapper).deleteByIds(ids); } } diff --git a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImplTest.java b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImplTest.java index 0b7585f..16e63d9 100644 --- a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImplTest.java +++ b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImplTest.java @@ -19,6 +19,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; +import java.time.LocalDateTime; import java.util.List; import static cn.iocoder.yudao.module.im.enums.ErrorCodeConstants.*; @@ -176,7 +177,8 @@ public class ImFriendRequestServiceImplTest extends BaseMockitoUnitTest { ImFriendRequestDO result = friendRequestService.applyFriend(1L, reqVO); // 断言：复用旧记录，未触发 insert - verify(friendRequestMapper).updateByIdReset(eq(100L), eq("再来一次"), eq("老张"), eq(2)); + verify(friendRequestMapper).updateByIdReset(eq(100L), eq("再来一次"), eq("老张"), eq(2), + any(java.time.LocalDateTime.class)); verify(friendRequestMapper, never()).insert(any(ImFriendRequestDO.class)); assertEquals(100L, result.getId()); assertEquals("再来一次", result.getApplyContent()); @@ -300,12 +302,29 @@ public class ImFriendRequestServiceImplTest extends BaseMockitoUnitTest { @Test public void testGetMyFriendRequestList_delegate() { // 准备：mapper 返回 mock 数据 - ImFriendRequestDO one = new ImFriendRequestDO().setId(1L); - when(friendRequestMapper.selectMyList(1L, 99L, 20)).thenReturn(java.util.Collections.singletonList(one)); - - // 调用 + 断言：参数透传、结果原样返回 + LocalDateTime updateTime = LocalDateTime.now(); + ImFriendRequestDO cursor = new ImFriendRequestDO(); + cursor.setId(99L); + cursor.setUpdateTime(updateTime); + ImFriendRequestDO one = new ImFriendRequestDO(); + one.setId(1L); + when(friendRequestMapper.selectById(99L)).thenReturn(cursor); + when(friendRequestMapper.selectMyList(1L, updateTime, 99L, 20)) + .thenReturn(java.util.Collections.singletonList(one)); + + // 调用 + 断言：cursor 由 Service 查询后传给 Mapper assertEquals(1, friendRequestService.getMyFriendRequestList(1L, 99L, 20).size()); - verify(friendRequestMapper).selectMyList(1L, 99L, 20); + verify(friendRequestMapper).selectMyList(1L, updateTime, 99L, 20); + } + + @Test + public void testGetMyFriendRequestList_cursorNotExists() { + // 准备：cursor 不存在 + when(friendRequestMapper.selectById(99L)).thenReturn(null); + + // 调用 + 断言：返回空列表 + assertTrue(friendRequestService.getMyFriendRequestList(1L, 99L, 20).isEmpty()); + verify(friendRequestMapper, never()).selectMyList(anyLong(), any(), anyLong(), anyInt()); } } diff --git a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImplTest.java b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImplTest.java index 64687e5..72537a0 100644 --- a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImplTest.java +++ b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupMemberServiceImplTest.java @@ -331,4 +331,18 @@ public class ImGroupMemberServiceImplTest extends BaseMockitoUnitTest { assertTrue(userIds.isEmpty()); } + @Test + public void testGetGroupMemberListByOwnerAndAdmin_passesRoles() { + List roles = List.of(ImGroupMemberRoleEnum.OWNER.getRole(), ImGroupMemberRoleEnum.ADMIN.getRole()); + List members = List.of(ImGroupMemberDO.builder().groupId(10L).userId(1L).build()); + when(groupMemberMapper.selectListByGroupIdAndStatusAndRoles(10L, CommonStatusEnum.ENABLE.getStatus(), roles)) + .thenReturn(members); + + List result = groupMemberService.getGroupMemberListByOwnerAndAdmin(10L); + + assertEquals(members, result); + verify(groupMemberMapper).selectListByGroupIdAndStatusAndRoles( + 10L, CommonStatusEnum.ENABLE.getStatus(), roles); + } + } diff --git a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImplTest.java b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImplTest.java index a5b9008..c62c1ae 100644 --- a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImplTest.java +++ b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImplTest.java @@ -757,7 +757,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); // 目标 3 是普通成员 when(groupMemberService.getGroupMembers(eq(10L), anyCollection())).thenReturn(List.of( ImGroupMemberDO.builder().userId(3L).status(CommonStatusEnum.ENABLE.getStatus()) @@ -765,6 +765,8 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { // 群里已有 1 个 ADMIN，1 + 1 ≤ 3 不超上限 when(groupMemberService.getGroupMemberCountByRole(10L, ImGroupMemberRoleEnum.ADMIN.getRole())) .thenReturn(1L); + when(groupMemberService.updateGroupMemberRole(eq(10L), anyCollection(), + eq(ImGroupMemberRoleEnum.ADMIN.getRole()))).thenReturn(1); ImGroupAdminAddReqVO reqVO = new ImGroupAdminAddReqVO(); reqVO.setGroupId(10L); @@ -786,7 +788,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); when(groupMemberService.getGroupMembers(eq(10L), anyCollection())).thenReturn(List.of( ImGroupMemberDO.builder().userId(5L).status(CommonStatusEnum.ENABLE.getStatus()) .role(ImGroupMemberRoleEnum.NORMAL.getRole()).build())); @@ -813,7 +815,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); when(groupMemberService.getGroupMembers(eq(10L), anyCollection())).thenReturn(List.of( ImGroupMemberDO.builder().userId(1L).status(CommonStatusEnum.ENABLE.getStatus()) .role(ImGroupMemberRoleEnum.OWNER.getRole()).build())); @@ -836,7 +838,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); // 目标已是 ADMIN：再加无需操作 when(groupMemberService.getGroupMembers(eq(10L), anyCollection())).thenReturn(List.of( ImGroupMemberDO.builder().userId(2L).status(CommonStatusEnum.ENABLE.getStatus()) @@ -863,10 +865,12 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); when(groupMemberService.getGroupMembers(eq(10L), anyCollection())).thenReturn(List.of( ImGroupMemberDO.builder().userId(2L).status(CommonStatusEnum.ENABLE.getStatus()) .role(ImGroupMemberRoleEnum.ADMIN.getRole()).build())); + when(groupMemberService.updateGroupMemberRole(eq(10L), anyCollection(), + eq(ImGroupMemberRoleEnum.NORMAL.getRole()))).thenReturn(1); ImGroupAdminRemoveReqVO reqVO = new ImGroupAdminRemoveReqVO(); reqVO.setGroupId(10L); @@ -888,7 +892,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); // 目标已是 MEMBER：撤销无需操作 when(groupMemberService.getGroupMembers(eq(10L), anyCollection())).thenReturn(List.of( ImGroupMemberDO.builder().userId(2L).status(CommonStatusEnum.ENABLE.getStatus()) @@ -914,10 +918,14 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); when(groupMemberService.validateMemberInGroup(10L, 2L)).thenReturn( ImGroupMemberDO.builder().groupId(10L).userId(2L) .role(ImGroupMemberRoleEnum.NORMAL.getRole()).build()); + when(groupMemberService.updateGroupMemberRole(eq(10L), eq(Set.of(2L)), + eq(ImGroupMemberRoleEnum.OWNER.getRole()))).thenReturn(1); + when(groupMemberService.updateGroupMemberRole(eq(10L), eq(Set.of(1L)), + eq(ImGroupMemberRoleEnum.NORMAL.getRole()))).thenReturn(1); ImGroupTransferOwnerReqVO reqVO = new ImGroupTransferOwnerReqVO(); reqVO.setGroupId(10L); @@ -945,7 +953,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(1L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); ImGroupTransferOwnerReqVO reqVO = new ImGroupTransferOwnerReqVO(); reqVO.setGroupId(10L); @@ -966,7 +974,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest { ImGroupDO group = ImGroupDO.builder().id(10L).ownerUserId(99L) .status(CommonStatusEnum.ENABLE.getStatus()).build(); - when(groupMapper.selectById(10L)).thenReturn(group); + when(groupMapper.selectByIdForUpdate(10L)).thenReturn(group); ImGroupTransferOwnerReqVO reqVO = new ImGroupTransferOwnerReqVO(); reqVO.setGroupId(10L);