| 
					
				 | 
			
			
				@@ -256,10 +256,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Date now = new Date(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         list.forEach(room -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                //校验房间主播是否在房间 如果不在房间则进行销毁判断 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (imFeignService.userExistInRoom(room.getRoomUid(), room.getSpeakerId().toString())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 destroyExpiredLiveRoom(now, room, expiredMinute); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 log.error("roomDestroy>>>> failed roomId:{} msg:{}", room.getId(), e.getMessage()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -317,6 +313,9 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (room.getLiveState() == 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             throw new BizException("直播未开始"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (room.getLiveState() == 2) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            throw new BizException("直播已经结束,请刷新数据!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         roomDestroy(room); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -740,14 +739,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Map<String, Object> test(String roomUid, Integer userId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //test 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String, Object> result = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //主播在房间的状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            boolean existInRoom = imFeignService.userExistInRoom(roomUid, userId.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            result.put("主播在房间", existInRoom ? "在" : "不在"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            result.put("主播在房间", "im无法连接"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //点赞数 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Object like = redissonClient.getBucket(LIVE_ROOM_LIKE.replace(ROOM_UID, roomUid)).get(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (Objects.isNull(like)) { 
			 |