Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/ImLiveBroadcastRoomService.java

@@ -42,14 +42,6 @@ public interface ImLiveBroadcastRoomService extends IService<ImLiveBroadcastRoom
      */
     ImLiveBroadcastRoomVo visitorRoomInfo(String roomUid, Integer userId);
 
-    /**
-     * 直播间配置信息
-     * @param room ImLiveBroadcastRoomVo
-     * @param sysUser SysUser
-     * @return ImLiveBroadcastRoomVo
-     */
-    ImLiveBroadcastRoomVo getLiveBroadcastRoomConfig(ImLiveBroadcastRoomVo room, SysUser sysUser);
-
     ImLiveBroadcastRoomVo queryRoomInfo(String roomUid);
 
     void add(ImLiveBroadcastRoomDto dto);

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

@@ -306,18 +306,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             throw new BizException(DateUtil.format(liveStartTime, "yyyy年MM月dd日 HH点mm分") + " 可进入直播间准备");
         }
 
-        return getLiveBroadcastRoomConfig(room, sysUser);
-    }
-
-    /**
-     * 直播间配置信息
-     * @param room ImLiveBroadcastRoomVo
-     * @param sysUser SysUser
-     * @return ImLiveBroadcastRoomVo
-     */
-    @Override
-    public ImLiveBroadcastRoomVo getLiveBroadcastRoomConfig(ImLiveBroadcastRoomVo room, SysUser sysUser) {
-
         room.setBlacklistFlag(0);
         //黑名单查询-查询当前用户是否在黑名单中
         int count = imLiveRoomBlackService.count(Wrappers.<ImLiveRoomBlack>lambdaQuery()

mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -54,9 +54,6 @@ public class RoomResult {
     @ApiModelProperty("直播间编号")
     public String liveRoomId;
 
-    @ApiModelProperty("直播间信息")
-    public ImLiveBroadcastRoomVo liveRoom;
-
     public RoomResult rtcRoomConfig(RTCRoomConfig rtcRoomConfig) {
         this.rtcRoomConfig = rtcRoomConfig;
         return this;

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -320,17 +320,11 @@ public class RoomServiceImpl implements RoomService {
             }
 
             // 返回直播间配置参数
-            ImLiveBroadcastRoomVo roomVo = JSON.parseObject(JSON.toJSONString(liveRoom), ImLiveBroadcastRoomVo.class);
-
-            roomResult.setLiveRoom(imLiveBroadcastRoomService.getLiveBroadcastRoomConfig(roomVo, sysUser)
-                    .autoCloseNetworkRoomTime(roomResult.getAutoCloseNetworkRoomTime())
-                    .surplusTime(roomResult.getSurplusTime()));
+            roomResult.setLiveRoomId(liveRoom.getRoomUid());
 
             // 主动触发用户加入直播间
             // imLiveBroadcastRoomService.joinRoom(liveRoom.getRoomUid(), sysUser.getId());
 
-            // 直播返回直播间信息
-            return new BaseResponse(roomResult.getLiveRoom());
         } else {
 
             // 创建聊天群组