moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "更新房间等级图标"

Browse Source 
This reverts commit d824a0e0424bd44cb4429e1a5d081f4b07f1a3fe.
This commit is contained in:
hokli
2024-12-26 13:55:36 +08:00
parent 45c6bf0291
commit 1a85a350f4
5 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomVo.java
View File

@@ -483,7 +483,6 @@ public class RoomVo implements Comparable<RoomVo> {
@ApiModelProperty("房间右下角icon1、2入口配置")
private RoomRightBottomIconVo rightBottomIconConfig;
private Integer roomLevel; // 房间等级
private String roomLevelIcon;//房间等级图标
private Integer usedMicSkinId;//使用中的麦位皮肤id
private Integer usedMicEffectId;//使用中的麦位特效id

1
accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/RankListener.java
View File

@@ -87,7 +87,6 @@ public class RankListener implements ApplicationListener<GiftMessageEvent> {
if (roomVo != null) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("serialValue", roomVo.getSerialValue());
jsonObject.put("roomLevelIcon", roomVo.getRoomLevelIcon());
sendSysMsgService.sendSingleRoomMessage(roomVo.getRoomId(), String.valueOf(roomVo.getUid()), Constant.DefMsgType.RANK, Constant.DefMsgType.RANK_UPDATE, jsonObject);
}
}

12
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/AbstractRoomService.java
View File

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.accompany.business.dto.QueueListResponseDTO;
import com.accompany.business.dto.QueueValueDTO;
import com.accompany.business.model.room.RoomLevelInfo;
import com.accompany.business.service.SendSysMsgService;
import com.accompany.business.service.rank.room.SendRoomDayRankService;
import com.accompany.business.service.redenvelope.RedEnvelopeServerNotifySwitchService;
@@ -15,7 +14,6 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.enums.RedisZSetEnum;
import com.accompany.common.netease.ErBanNetEaseService;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.account.AccountService;
import com.accompany.core.service.common.JedisService;
import lombok.extern.slf4j.Slf4j;
@@ -75,9 +73,6 @@ public abstract class AbstractRoomService implements IRoom {
@Autowired
private SendRoomDayRankService sendRoomDayRankService;
@Autowired
private RoomLevelService roomLevelService;
@Override
public void wrapRoom(Room room) {
Long roomUid = room.getUid();
@@ -130,13 +125,6 @@ public abstract class AbstractRoomService implements IRoom {
}
BigDecimal rankScore = dayRank.stream().map(v -> new BigDecimal(v.get(RedisZSetEnum.score.name()).toString())).reduce(BigDecimal.ZERO, BigDecimal::add);
roomVo.setSerialValue(rankScore.setScale(2, RoundingMode.DOWN).doubleValue());
RoomLevelInfo roomLevelInfo = roomLevelService.getRoomLevelByRoomUid(roomVo.getPartitionId(), roomVo.getUid());
Integer roomLevel = 1;
if (roomLevelInfo != null) {
roomLevel = roomLevelInfo.getLevelSeq();
roomVo.setRoomLevel(roomLevel);
roomVo.setRoomLevelIcon(roomLevelInfo.getLevelIcon());
}
}
@Override

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

@@ -901,14 +901,6 @@ public class RoomService extends BaseService {
return roomMapper.selectByPrimaryKey(uid);
}
public RoomVo getRoomVoByUid(Long uid) {
Room room = getRoomByUid(uid);
if (room == null) {
return null;
}
return convertRoomToVo(room);
}
public Room getRoomByUid(Long uid) {
Room room = getRoomCacheByUid(uid);
if (room == null) {
@@ -920,6 +912,14 @@ public class RoomService extends BaseService {
return room;
}
public RoomVo getRoomVoByUid(Long uid) {
Room room = getRoomByUid(uid);
if (room == null) {
return null;
}
return convertRoomToVo(room);
}
public RoomVo getRoomVoWithUsersByUid(Long uid) {
Room room = getRoomByUid(uid);
if (room == null) {

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java
View File

@@ -255,11 +255,11 @@ public class RoomController extends BaseController {
roomLevel = roomLevelInfo.getLevelSeq();
roomVo.setRoomLevelIcon(roomLevelInfo.getLevelIcon());
}
RoomMicDress roomMicDress = roomMicDressService.roomMicDressUsed(RoomConstant.MicDressType.EFFECT, uid, roomVo.getRoomLevel());
RoomMicDress roomMicDress = roomMicDressService.roomMicDressUsed(RoomConstant.MicDressType.EFFECT, uid, roomLevel);
if (roomMicDress != null) {
roomVo.setUsedMicEffectId(roomMicDress.getId());
}
RoomMicDress roomMicSkin = roomMicDressService.roomMicDressUsed(RoomConstant.MicDressType.SKIN, uid, roomVo.getRoomLevel());
RoomMicDress roomMicSkin = roomMicDressService.roomMicDressUsed(RoomConstant.MicDressType.SKIN, uid, roomLevel);
if (roomMicSkin != null) {
roomVo.setUsedMicSkinId(roomMicSkin.getId());
}