update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImLiveBroadcastRoom.java

@@ -84,7 +84,7 @@ public class ImLiveBroadcastRoom implements Serializable {
     private String os = "pc";
 
     @TableField("service_provider_")
-    @ApiModelProperty(value = "服务提供方 RONG_CLOUD TENCENT_CLOUD")
+    @ApiModelProperty(value = "服务提供方 rongCloud tencentCloud")
     private String serviceProvider;
 
     @TableField("created_by_")

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -12,6 +12,7 @@ import com.microsvc.toolkit.middleware.live.LivePluginContext;
 import com.microsvc.toolkit.middleware.live.LivePluginService;
 import com.microsvc.toolkit.middleware.live.impl.TencentCloudLivePlugin;
 import com.microsvc.toolkit.middleware.live.message.LiveRoomConfig;
+import com.microsvc.toolkit.middleware.live.message.LiveRoomUser;
 import com.microsvc.toolkit.middleware.live.message.RTCRoom;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -487,7 +488,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         });
     }
 
-    private void destroyExpiredLiveRoom(Date now, ImLiveBroadcastRoom room, int expiredMinute) {
+    private void destroyExpiredLiveRoom(Date now, ImLiveBroadcastRoom room, int expiredMinute) throws Exception {
         log.error("roomDestroy destroyExpiredLiveRoom >>>> now {} roomInfo : {} expiredMinute:{}", now, JSONObject.toJSONString(room), expiredMinute);
         //过期时间 = LiveStartTime + expiredMinute
         Date expiredTime = DateUtil.addMinutes(room.getLiveStartTime(), expiredMinute);
@@ -500,7 +501,8 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (speakerCache.isExists()) {
             RoomSpeakerInfo speakerInfo = speakerCache.get();
             //查询用户是否在线
-            if (imFeignService.checkOnline(speakerInfo.getSpeakerId().toString())) {
+            LiveRoomUser liveRoomUser = livePluginContext.getPluginService(room.getServiceProvider()).chatRoomUserExist(room.getId().toString(),speakerInfo.getSpeakerId().toString());
+            if (Objects.nonNull(liveRoomUser) && StringUtils.equals(liveRoomUser.getStatus(),"1")) {
                 log.info("roomDestroy destroyExpiredLiveRoom  is online >>>> roomId:{} speakerId:{}", room.getId(), speakerInfo.getSpeakerId());
                 return;
             }
@@ -1170,7 +1172,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             //推送预约直播间消息
             imLiveRoomReservationService.push(room);
             //推送直播开始消息
-            sendRoomLiveState(sysUser, room, MessageTypeEnum.JIGUANG_LIVE_STARTED);
+            this.sendRoomLiveState(sysUser, room, MessageTypeEnum.JIGUANG_LIVE_STARTED);
         } catch (Exception e) {
             log.error(">>>>>>>>>> createLiveRoom error roomUid:{} msg:{}", room.getRoomUid(), e.getMessage());
         }