From b2e2c700f8831498af926b28656ef0d0bb03dab9 Mon Sep 17 00:00:00 2001 From: khalil Date: Tue, 14 May 2024 18:49:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E9=BA=A6=E4=BD=8D=E9=98=9F?= =?UTF-8?q?=E5=88=97-=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-native.yml | 1 - .../src/main/resources/application-native.yml | 1 - .../business/service/room/RoomService.java | 33 ++++--------------- .../src/main/resources/application-native.yml | 1 - .../src/main/resources/application-native.yml | 1 - .../src/main/resources/application-native.yml | 1 - 6 files changed, 6 insertions(+), 32 deletions(-) diff --git a/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml b/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml index 3d2dc0f73..4ed874c9a 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml +++ b/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: | diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml index eb3427888..2d0800a20 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml +++ b/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: | diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java index 5f8149d0b..5dd259e56 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java +++ b/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 filteRobotRoom(List rooms) { - Iterator 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; - } - /** * 获取需要隐藏的在线房间，如牌照房没人时的房间 * diff --git a/accompany-business/accompany-business-web/src/main/resources/application-native.yml b/accompany-business/accompany-business-web/src/main/resources/application-native.yml index 75f8e6e1e..9fd33f4ec 100644 --- a/accompany-business/accompany-business-web/src/main/resources/application-native.yml +++ b/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: | diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml b/accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml index 01d06dce0..6a5db0eae 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml +++ b/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: | diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml b/accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml index eb3427888..2d0800a20 100644 --- a/accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml +++ b/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: |