|
@@ -2263,6 +2263,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
throw new BizException("当前用户存在更早的待直播的房间");
|
|
|
}*/
|
|
|
|
|
|
+ ImLiveBroadcastRoomVo roomVo = getImLiveBroadcastRoomVo(room.getRoomUid());
|
|
|
//去融云创建房间
|
|
|
LivePluginService pluginService = livePluginContext.getPluginService(room.getServiceProvider());
|
|
|
|
|
@@ -2272,6 +2273,8 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
// 创建直播间IM群
|
|
|
pluginService.chatRoomCreate(room.getRoomUid(), room.getRoomTitle(),imGroupCoreService.getImUserId(sysUser.getId().toString(),room.getClientType().getCode()));
|
|
|
|
|
|
+ // 设置直播间房间属性默认值
|
|
|
+ setDefaultRoomDefinedInfo(roomVo);
|
|
|
createSpeakerInfo(room, sysUser);
|
|
|
Boolean whetherVideoFlag = getRoomConfig(room.getRoomConfig()).map(o -> o.getWhether_video() == 0).orElse(true);
|
|
|
|
|
@@ -2320,15 +2323,12 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
.eq(ImLiveRoomBlack::getRoomUid, room.getRoomUid())
|
|
|
.list();
|
|
|
|
|
|
- ImLiveBroadcastRoomVo roomVo = getImLiveBroadcastRoomVo(room.getRoomUid());
|
|
|
if (CollectionUtils.isNotEmpty(blackList)) {
|
|
|
// 将黑名单人员踢出房间
|
|
|
for (ImLiveRoomBlack black : blackList) {
|
|
|
imLiveRoomBlackService.setBlack(black.getUserId(),roomVo);
|
|
|
}
|
|
|
}
|
|
|
- // 设置直播间房间属性默认值
|
|
|
- setDefaultRoomDefinedInfo(roomVo);
|
|
|
} finally {
|
|
|
if (lock.getHoldCount() != 0 && lock.isHeldByCurrentThread()) {
|
|
|
lock.unlock();
|
|
@@ -2398,6 +2398,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
.groupId(roomVo.getRoomUid())
|
|
|
.appDefinedData(appDefinedData)
|
|
|
.build());
|
|
|
+ log.info("设置直播群配置成功 roomUid:{}", roomVo.getRoomUid());
|
|
|
} catch (Exception e) {
|
|
|
log.error("设置直播群配置失败", e);
|
|
|
}
|