房间麦位队列-循环依赖

accompany-admin/accompany-admin-web/src/main/resources/application-native.yml

@@ -26,7 +26,6 @@ spring:
     testOnBorrow: true
     testOnReturn: true
     password: anan@dev@redis@#!
-    database: 1
     redisson:
       #      file: classpath:redisson.yaml
       config: |

accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml

@@ -26,7 +26,6 @@ spring:
     testOnBorrow: true
     testOnReturn: true
     password: anan@dev@redis@#!
-    database: 1
     redisson:
       #      file: classpath:redisson.yaml
       config: |

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java

@@ -84,7 +84,6 @@ import com.accompany.core.util.BeanUtils;
 import com.accompany.core.util.I18NMessageSourceUtil;
 import com.accompany.core.util.PartitionUtil;
 import com.accompany.core.vo.UserVo;
-import com.accompany.core.vo.vip.UserVipInfoVO;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
@@ -136,6 +135,7 @@ public class RoomService extends BaseService {
     @Lazy
     private RoomMicService roomMicService;
     @Autowired
+    @Lazy
     private RoomCleanService roomCleanService;
     @Autowired
     private GiftSendRecordMapperExpand giftSendRecordMapperExpand;
@@ -144,18 +144,21 @@ public class RoomService extends BaseService {
     @Autowired
     private FansMapperExpand fansMapperExpand;
     @Autowired
+    @Lazy
     private FansRoomService fansRoomService;
     @Autowired
     private RoomInviteRecordMapper roomInviteRecordMapper;
     @Autowired
     private RoomGameMapper roomGameMapper;
     @Autowired
+    @Lazy
     private RoomGiftValueService roomGiftValueService;
     @Autowired
     private LiveAttestationService liveAttestationService;
     @Autowired
     private ApplicationContext applicationContext;
     @Autowired
+    @Lazy
     private SuperAdminWebService superAdminWebService;
     @Autowired
     private LevelService levelService;
@@ -175,23 +178,18 @@ public class RoomService extends BaseService {
     private IBlindDateRoundService iBlindDateRoundService;
     @Autowired
     private BlindDateRoundHistoryService blindDateRoundHistoryService;
-
     @Autowired
     private MiniGameRoomService miniGameRoomService;
-
     @Autowired
     private MiniGameService miniGameService;
-
     @Autowired
     private MiniGameSwitchRecordService miniGameSwitchRecordService;
-
     @Autowired
     private MiniGameRoundMapper miniGameRoundMapper;
-
     @Autowired
     private SingleBroadcastSortService singleBroadcastSortService;
-
     @Autowired
+    @Lazy
     private RoomRedEnvelopeService roomRedEnvelopeService;
 
     private static Long encodeNum = 1000L;
@@ -295,7 +293,7 @@ public class RoomService extends BaseService {
         }
         room.setIsCloseScreen(isCloseScreen);
         // 这里默认认为是房主或管理员，后续有改动再改造
-        room.setCloseScreenFlag(pubUid != null && this.superAdminWebService.isSuperAdmin(pubUid, false) ?
+        room.setCloseScreenFlag(pubUid != null && SpringContextHolder.getBean(SuperAdminWebService.class).isSuperAdmin(pubUid, false) ?
                 Constant.ScreenOperateRole.superAdmin : Constant.ScreenOperateRole.owner);
         return updateRunningRoom(room);
     }
@@ -1714,25 +1712,6 @@ public class RoomService extends BaseService {
         return busiResult;
     }
 
-    /**
-     * 过滤没活人的房间
-     *
-     * @param rooms
-     * @return
-     */
-    public List<RoomVo> filteRobotRoom(List<RoomVo> rooms) {
-        Iterator<RoomVo> it = rooms.iterator();
-        while (it.hasNext()) {
-            RoomVo roomVo = it.next();
-            if (roomVo.getOnlineNum() < 21 && !roomCleanService.hasRealUserInRoom(roomVo.getRoomId())) {
-                it.remove();
-            } else if (StringUtils.isNotBlank(roomVo.getRoomPwd())) {
-                it.remove();
-            }
-        }
-        return rooms;
-    }
-
     /**
      * 获取需要隐藏的在线房间，如牌照房没人时的房间
      *

accompany-business/accompany-business-web/src/main/resources/application-native.yml

@@ -26,7 +26,6 @@ spring:
     testOnBorrow: true
     testOnReturn: true
     password: anan@dev@redis@#!
-    database: 1
     redisson:
       #      file: classpath:redisson.yaml
       config: |

accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml

@@ -26,7 +26,6 @@ spring:
     testOnBorrow: true
     testOnReturn: true
     password: anan@dev@redis@#!
-    database: 1
     redisson:
       #      file: classpath:redisson.yaml
       config: |

accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml

@@ -26,7 +26,6 @@ spring:
     testOnBorrow: true
     testOnReturn: true
     password: anan@dev@redis@#!
-    database: 1
     redisson:
       #      file: classpath:redisson.yaml
       config: |