Browse Source

优化:销毁房间注释

hgw 3 years ago
parent
commit
963b58d23a

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

@@ -261,17 +261,17 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             RoomSpeakerInfo speakerInfo = speakerCache.get();
             //过期时间= 房间正式开始时间+expiredMinute 分钟
             Date expiredTime = DateUtil.addMinutes(room.getCreatedTime(), expiredMinute);
-            // 现在 超过过期时间没有进入房间 则销毁房间
+            //当前时间 大于(创建房间时填入的开播时间 + 设置的过期分钟数)并且 主播没有进入房间
             if (now.getTime() >= expiredTime.getTime() && Objects.isNull(speakerInfo.getJoinRoomTime())) {
                 roomDestroy(room);
                 log.info("roomDestroy not joinRoom >>>> roomId:{}", room.getId());
                 return;
             }
 
-            //现在时间 超过 (退出房间的时间 + expiredMinute 分钟) 则销毁房间
             if (Objects.nonNull(speakerInfo.getExitRoomTime())) {
                 Date comparedTime = DateUtil.addMinutes(speakerInfo.getExitRoomTime(), expiredMinute);
-                if (now.getTime() >= comparedTime.getTime() && speakerInfo.getState() != 0) {
+                //当前时间 大于 创建房间时填入的开播时间 并且 当前时间 大于  (主播退出时间 + 设置的过期分钟数) 并且 是直播中断状态
+                if (now.getTime() >= room.getCreatedTime().getTime() && now.getTime() >= comparedTime.getTime() && speakerInfo.getState() != 0) {
                     roomDestroy(room);
                     log.info("roomDestroy exitRoom >>>> roomId:{}", room.getId());
                 }