Merge branch 'dev_20230222_live' into master_saas

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

@@ -1703,12 +1703,16 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
 
 
             //记录用户当前房间uid
-            RBucket<Object> bucket = redissonClient.getBucket(
+            RBucket<String> bucket = redissonClient.getBucket(
                 SPEAKER_ROOM_ING_INFO.replace(USER_ID, room.getSpeakerId().toString()));
 
+
             if (bucket.isExists()) {
-               log.info("createLiveRoom>>>>>>roomUid:{} is exists", bucket.get());
-               return;
+                ImLiveBroadcastRoomVo imLiveBroadcastRoomVo = getImLiveBroadcastRoomVo(bucket.get());
+                if (imLiveBroadcastRoomVo != null && imLiveBroadcastRoomVo.getLiveState() == 1) {
+                    log.info("createLiveRoom>>>>>>roomUid:{} is exists", bucket.get());
+                    return;
+                }
             }
 
             //去融云创建房间