Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/ImLiveBroadcastRoomVo.java

@@ -137,6 +137,12 @@ public class ImLiveBroadcastRoomVo implements Serializable {
     @ApiModelProperty("使用场景 正常：NORMAL 音乐：MUSIC")
     private EUseScene useScene;
 
+    @ApiModelProperty("课程结束后多少分钟关闭网络教室")
+    private String autoCloseNetworkRoomTime;
+
+    @ApiModelProperty("剩余时长")
+    private int surplusTime;
+
     public EUseScene getUseScene() {
         return useScene;
     }
@@ -456,5 +462,31 @@ public class ImLiveBroadcastRoomVo implements Serializable {
     public void setShoppingTitle(String shoppingTitle) {
         this.shoppingTitle = shoppingTitle;
     }
+
+    public String getAutoCloseNetworkRoomTime() {
+        return autoCloseNetworkRoomTime;
+    }
+
+    public void setAutoCloseNetworkRoomTime(String autoCloseNetworkRoomTime) {
+        this.autoCloseNetworkRoomTime = autoCloseNetworkRoomTime;
+    }
+
+    public int getSurplusTime() {
+        return surplusTime;
+    }
+
+    public void setSurplusTime(int surplusTime) {
+        this.surplusTime = surplusTime;
+    }
+
+    public ImLiveBroadcastRoomVo surplusTime(int surplusTime) {
+        this.surplusTime = surplusTime;
+        return this;
+    }
+
+    public ImLiveBroadcastRoomVo autoCloseNetworkRoomTime(String autoCloseNetworkRoomTime) {
+        this.autoCloseNetworkRoomTime = autoCloseNetworkRoomTime;
+        return this;
+    }
 }
 

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -32,6 +32,11 @@ public class RoomController{
         return roomService.joinRoom(data.getRoomId(), true);
     }
 
+    @RequestMapping(value = "/joinLive", method = RequestMethod.POST)
+    public BaseResponse joinLiveRoom(@RequestBody ReqUserData data) throws Exception {
+        return new BaseResponse(roomService.joinRoom(data.getRoomId(), false));
+    }
+
     @ApiOperation("查询网络教室信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "roomId", value = "房间id", required = true, dataType = "String", paramType = "query")

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

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