离开频道处理逻辑调整

core/src/main/java/com/wecloud/im/controller/ImRtcController.java

 package com.wecloud.im.controller;
 package com.wecloud.im.controller;
 
 
+import com.wecloud.im.enums.CallTypeEnum;
 import com.wecloud.im.param.rtc.CandidateForwardParam;
 import com.wecloud.im.param.rtc.CandidateForwardParam;
 import com.wecloud.im.param.rtc.CreateRtcChannelParam;
 import com.wecloud.im.param.rtc.CreateRtcChannelParam;
 import com.wecloud.im.param.rtc.CreateRtcChannelResult;
 import com.wecloud.im.param.rtc.CreateRtcChannelResult;
@@ -8,8 +9,10 @@ import com.wecloud.im.param.rtc.LeaveRtcChannelParam;
 import com.wecloud.im.param.rtc.RejectRtcChannelParam;
 import com.wecloud.im.param.rtc.RejectRtcChannelParam;
 import com.wecloud.im.param.rtc.SdpForwardParam;
 import com.wecloud.im.param.rtc.SdpForwardParam;
 import com.wecloud.rtc.service.RtcService;
 import com.wecloud.rtc.service.RtcService;
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +43,9 @@ public class ImRtcController extends BaseController {
     @PostMapping("/createAndCall")
     @PostMapping("/createAndCall")
     @ApiOperation(value = "创建频道,并邀请客户端加入", notes = "创建频道,并邀请客户端加入")
     @ApiOperation(value = "创建频道,并邀请客户端加入", notes = "创建频道,并邀请客户端加入")
     public ApiResult<CreateRtcChannelResult> createAndCall(@RequestBody CreateRtcChannelParam createRtcChannelParam) throws Exception {
     public ApiResult<CreateRtcChannelResult> createAndCall(@RequestBody CreateRtcChannelParam createRtcChannelParam) throws Exception {
+        if (BaseEnum.valueOf(CallTypeEnum.class, createRtcChannelParam.getCallType()) == null) {
+            return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null);
+        }
         return rtcService.createAndCall(createRtcChannelParam);
         return rtcService.createAndCall(createRtcChannelParam);
     }
     }
 
 

core/src/main/java/com/wecloud/rtc/service/MangerRtcCacheService.java

@@ -43,7 +43,7 @@ public interface MangerRtcCacheService {
      * @param clientId
      * @param clientId
      * @param rtcChannelId 雪花算法生成频道id
      * @param rtcChannelId 雪花算法生成频道id
      */
      */
-    void create(Long clientId, Long rtcChannelId) throws JsonProcessingException;
+    void create(Long clientId, Long toClientId, Long rtcChannelId) throws JsonProcessingException;
 
 
     /**
     /**
      * 加入频道
      * 加入频道

core/src/main/java/com/wecloud/rtc/service/impl/MangerRtcCacheServiceImpl.java

@@ -54,7 +54,7 @@ public class MangerRtcCacheServiceImpl implements MangerRtcCacheService {
 
 
 
 
     @Override
     @Override
-    public void create(Long clientId, Long rtcChannelId) {
+    public void create(Long clientId, Long toClientId, Long rtcChannelId) {
 
 
         // --- 频道信息
         // --- 频道信息
         RtcChannelInfo rtcChannelInfo = new RtcChannelInfo();
         RtcChannelInfo rtcChannelInfo = new RtcChannelInfo();
@@ -77,6 +77,7 @@ public class MangerRtcCacheServiceImpl implements MangerRtcCacheService {
         //频道中存在的用户
         //频道中存在的用户
         String rtcChannelUsers = String.format(RtcRedisKey.RTC_CHANNEL_USERS, rtcChannelId);
         String rtcChannelUsers = String.format(RtcRedisKey.RTC_CHANNEL_USERS, rtcChannelId);
         redisUtils.addForSet(rtcChannelUsers, clientId + "", 10, TimeUnit.DAYS);
         redisUtils.addForSet(rtcChannelUsers, clientId + "", 10, TimeUnit.DAYS);
+        redisUtils.addForSet(rtcChannelUsers, toClientId + "", 10, TimeUnit.DAYS);
 
 
     }
     }
 
 
@@ -86,10 +87,6 @@ public class MangerRtcCacheServiceImpl implements MangerRtcCacheService {
         //用户当前在线的频道ID
         //用户当前在线的频道ID
         String userJoinChannelKey = String.format(RtcRedisKey.USER_JOIN_CHANNEL, clientId);
         String userJoinChannelKey = String.format(RtcRedisKey.USER_JOIN_CHANNEL, clientId);
         redisUtils.addKey(userJoinChannelKey, rtcChannelId.toString(), Duration.ofDays(10));
         redisUtils.addKey(userJoinChannelKey, rtcChannelId.toString(), Duration.ofDays(10));
-
-        //频道中存在的用户
-        String rtcChannelUsers = String.format(RtcRedisKey.RTC_CHANNEL_USERS, rtcChannelId);
-        redisUtils.addForSet(rtcChannelUsers, clientId + "", 10, TimeUnit.DAYS);
     }
     }
 
 
 
 

core/src/main/java/com/wecloud/rtc/service/impl/WsRtcWriteImpl.java

@@ -35,7 +35,6 @@ public class WsRtcWriteImpl implements WsRtcWrite {
         responseModel.setData(rtcCallResponse);
         responseModel.setData(rtcCallResponse);
         responseModel.setReqId(null);
         responseModel.setReqId(null);
         channelSender.sendMsg(responseModel, toClientId);
         channelSender.sendMsg(responseModel, toClientId);
-
     }
     }
 
 
     @Override
     @Override
@@ -51,8 +50,6 @@ public class WsRtcWriteImpl implements WsRtcWrite {
         responseModel.setData(rtcClientJoinResponse);
         responseModel.setData(rtcClientJoinResponse);
         responseModel.setReqId(null);
         responseModel.setReqId(null);
         channelSender.sendMsg(responseModel, toClientId);
         channelSender.sendMsg(responseModel, toClientId);
-
-
     }
     }
 
 
     @Override
     @Override
@@ -68,7 +65,6 @@ public class WsRtcWriteImpl implements WsRtcWrite {
         responseModel.setData(rtcClientLeaveResponse);
         responseModel.setData(rtcClientLeaveResponse);
         responseModel.setReqId(null);
         responseModel.setReqId(null);
         channelSender.sendMsg(responseModel, toClientId);
         channelSender.sendMsg(responseModel, toClientId);
-
     }
     }
 
 
     @Override
     @Override