单人rtc查找完善

core/src/main/java/com/wecloud/im/service/impl/ImRtcRecordServiceImpl.java

@@ -11,16 +11,15 @@ import com.wecloud.im.param.rtc.CreateRtcChannelParam;
 import com.wecloud.im.param.rtc.SingleRtcRecordParam;
 import com.wecloud.im.param.rtc.SingleRtcRecordParam;
 import com.wecloud.im.sdk.enums.RtcStateEnum;
 import com.wecloud.im.sdk.enums.RtcStateEnum;
 import com.wecloud.im.sdk.enums.SingleRtcOperateTypeEnum;
 import com.wecloud.im.sdk.enums.SingleRtcOperateTypeEnum;
-import com.wecloud.im.service.ImClientService;
 import com.wecloud.im.service.ImRtcRecordService;
 import com.wecloud.im.service.ImRtcRecordService;
 import com.wecloud.utils.SnowflakeUtil;
 import com.wecloud.utils.SnowflakeUtil;
 import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
+import io.geekidea.springbootplus.framework.shiro.util.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.Date;
 
 
 
 
@@ -33,10 +32,6 @@ import java.util.Date;
 @Service
 @Service
 public class ImRtcRecordServiceImpl extends BaseServiceImpl<ImRtcRecordMapper, ImRtcRecord> implements ImRtcRecordService {
 public class ImRtcRecordServiceImpl extends BaseServiceImpl<ImRtcRecordMapper, ImRtcRecord> implements ImRtcRecordService {
 
 
-    @Resource
-    private ImClientService imClientService;
-
-
     @Async
     @Async
     @Override
     @Override
     public void createRtcRecord(CreateRtcChannelParam param, Long channelId, ImClient currentClient) {
     public void createRtcRecord(CreateRtcChannelParam param, Long channelId, ImClient currentClient) {
@@ -101,9 +96,9 @@ public class ImRtcRecordServiceImpl extends BaseServiceImpl<ImRtcRecordMapper, I
         if (param.getPageSize() == null) {
         if (param.getPageSize() == null) {
             throw new BusinessException("每页数量不可为空");
             throw new BusinessException("每页数量不可为空");
         }
         }
-        ImClient imClient = imClientService.getCurrentClient();
+        Long appId = SecurityUtils.getCurrentAppId();
         LambdaQueryWrapper<ImRtcRecord> rtcRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ImRtcRecord> rtcRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        rtcRecordLambdaQueryWrapper.eq(ImRtcRecord::getFkAppid, imClient.getFkAppid());
+        rtcRecordLambdaQueryWrapper.eq(ImRtcRecord::getFkAppid, appId);
         rtcRecordLambdaQueryWrapper.eq(param.getFromClientId() != null, ImRtcRecord::getFromClientId, param.getFromClientId());
         rtcRecordLambdaQueryWrapper.eq(param.getFromClientId() != null, ImRtcRecord::getFromClientId, param.getFromClientId());
         rtcRecordLambdaQueryWrapper.eq(param.getToClientId() != null, ImRtcRecord::getToClientId, param.getToClientId());
         rtcRecordLambdaQueryWrapper.eq(param.getToClientId() != null, ImRtcRecord::getToClientId, param.getToClientId());
         rtcRecordLambdaQueryWrapper.eq(param.getChannelId() != null, ImRtcRecord::getChannelId, param.getChannelId());
         rtcRecordLambdaQueryWrapper.eq(param.getChannelId() != null, ImRtcRecord::getChannelId, param.getChannelId());