多人音视频事件下发

451bc9c9 · Future · 9d79bbf3 · 451bc9c9
Commit 451bc9c9 authored Mar 25, 2022 by Future
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java
+3 -3

No files found.
--- a/core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java
+++ b/core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java
@@ -103,15 +103,15 @@ public class MultiMeetServiceImpl implements MultiMeetService {
            // 占线 通知邀请方
            ImMultiRtcRoomMember rtcRoomMember = imMultiRtcRoomMemberService.getOne(new QueryWrapper<ImMultiRtcRoomMember>().lambda()
                    .eq(ImMultiRtcRoomMember::getClientId, toClientId)
-                    .eq(ImMultiRtcRoomMember::getRoomId, param.getRoomId()));
+                    .in(ImMultiRtcRoomMember::getState, Lists.newArrayList(MultiRtcMemberStateEnum.ANSWERED.getCode(), MultiRtcMemberStateEnum.CALLING.getCode())));
-            if (rtcRoomMember != null && MultiRtcMemberStateEnum.ANSWERED.getCode().equals(rtcRoomMember.getState())) {
+            if (rtcRoomMember != null && Lists.newArrayList(MultiRtcMemberStateEnum.ANSWERED.getCode(), MultiRtcMemberStateEnum.CALLING.getCode()).contains(rtcRoomMember.getState())) {
                MultiMeetBusyResponse multiMeetBusyResponse = new MultiMeetBusyResponse();
                multiMeetBusyResponse.setConversationId(param.getConversationId());
                multiMeetBusyResponse.setRoomId(param.getRoomId());
                multiMeetBusyResponse.setClientId(currentClient.getClientId());
                multiMeetBusyResponse.setBusyClientId(rtcRoomMember.getClientId());
                multiMeetBusyResponse.setTimestamp(System.currentTimeMillis());
-                wsMultiMeetWrite.busy(multiMeetBusyResponse, rtcRoomMember.getFkClientId());
+                wsMultiMeetWrite.busy(multiMeetBusyResponse, currentClient.getId());
                continue;
            }