Browse Source

修改:销毁房间逻辑

hgw 3 years ago
parent
commit
6c66193f40

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

@@ -319,8 +319,18 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         log.error("roomDestroy>>>> room : {}", JSONObject.toJSONString(room));
         String roomUid = room.getRoomUid();
         Integer speakerId = room.getSpeakerId();
+
         try {
+            //向聊天室发自定义消息踢出所有人
+            ImRoomMessage message = new ImRoomMessage();
+            message.setFromUserId(speakerId.toString());
+            message.setToChatroomId(roomUid);
+            message.setObjectName(ImRoomMessage.FORCED_OFFLINE);
+            imFeignService.publishRoomMsg(message);
+            log.info("roomDestroy>>>> FORCED_OFFLINE {}", JSONObject.toJSONString(message));
+            //销毁直播间
             imFeignService.destroyLiveRoom(roomUid);
+            log.info("roomDestroy>>>> destroyLiveRoom {}", JSONObject.toJSONString(message));
         } catch (Exception e) {
             log.error("roomDestroy>>>> errorMsg{}", e.getMessage(), e.getCause());
         }
@@ -342,18 +352,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         room.setUpdatedTime(date);
         room.setLiveEndTime(date);
         this.updateById(room);
-
-        //向聊天室发自定义消息踢出所有人
-        ImRoomMessage message = new ImRoomMessage();
-        message.setFromUserId(speakerId.toString());
-        message.setToChatroomId(roomUid);
-        message.setObjectName(ImRoomMessage.FORCED_OFFLINE);
-        try {
-            imFeignService.publishRoomMsg(message);
-        } catch (Exception e) {
-            log.error("roomDestroy>>>> publishRoomErrorMsg{}", e.getMessage(), e.getCause());
-        }
-        log.info("roomDestroy>>>> FORCED_OFFLINE {}", JSONObject.toJSONString(message));
     }
 
     //获取该直播间所有数据写入数据库-并清理缓存