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

多语言-首页房间列表返回公告

Browse Source
This commit is contained in:
liaozetao
2024-04-15 10:54:45 +08:00
committed by khalil
parent 14c7f5b060
commit fe8926a20e
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java
View File

@@ -1336,6 +1336,8 @@ public class Constant {
public static final String INVITE_FISSION_ACT_CONFIG = "invite_fission_act_config";
public static final String SUPER_LUCKY_GIFT_CONFIG = "super_lucky_gift_config";
public static final String GIFT_SEND_CONSUME_GOLD_SWITCH = "gift_send_consume_gold_switch";
public static final String WEEK_OR_HOUR_TOP_ICON_CONFIG = "week_or_hour_top_icon_config";
}
public static class WithDrawStatus {

7
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/PlayRoomVo.java
View File

@@ -10,6 +10,7 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @Author: yangming
@@ -128,4 +129,10 @@ public class PlayRoomVo {
*/
@ApiModelProperty("地区ID")
private Integer partitionId;
/**
* 房间公告
*/
@ApiModelProperty("房间公告")
private String introduction;
}

1
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/decorator/UsersRoomDecorator.java
View File

@@ -32,6 +32,7 @@ public class UsersRoomDecorator<T extends PlayRoomVo> extends PlayRoomDecorator<
if (any.isPresent()) {
Room room = any.get();
playRoom.setRoomId(room.getRoomId());
playRoom.setIntroduction(room.getIntroduction());
}
}
if (CollectionUtil.isNotEmpty(userList)) {

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/impl/HomeIndexServiceImpl.java
View File

@@ -31,9 +31,11 @@ import com.accompany.business.vo.home.PlayRoomVo;
import com.accompany.business.vo.room.PermitRoomHourRankVo;
import com.accompany.common.constant.ApplicationConstant;
import com.accompany.common.constant.Constant;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.GsonUtil;
import com.accompany.core.base.DeviceInfoContextHolder;
import com.accompany.core.base.UidContextHolder;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -98,6 +100,7 @@ public class HomeIndexServiceImpl implements HomeIndexService {
@Override
public List<PlayRoomVo> hotRoom() {
DeviceInfo deviceInfo = DeviceInfoContextHolder.get();
Map<String, String> roomMicUpMap = jedisService.hgetAll(RedisKey.room_mic_up.getKey());
if (CollectionUtil.isEmpty(roomMicUpMap)) {
return new ArrayList<>();

15
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeController.java
View File

@@ -65,7 +65,7 @@ public class HomeController extends BaseController {
@ApiOperation("获取首页动态数据")
@GetMapping(value = "/dynamic")
@Authorization
public BusiResult<List<DynamicVo>> getHomeDynamic(HttpServletRequest request, @RequestParam("uid") Long uid) throws Exception{
public BusiResult<List<DynamicVo>> getHomeDynamic(HttpServletRequest request, @RequestParam("uid") Long uid) throws Exception {
DeviceInfo deviceInfo = getDeviceInfo(request);
List<DynamicVo> dynamicVos = homeService.getHomeDynamic(uid);
dynamicVos = channelContentPartitionService.filterByChannelContent(uid, deviceInfo, dynamicVos, homeService::filterHomeDynamicByChannel);
@@ -124,14 +124,21 @@ public class HomeController extends BaseController {
@GetMapping(value = "/tab/home/one")
public BusiResult<Long> getRoomTabHomeOne() throws Exception {
Long roomUid = homeService.getRoomTabHomeOne(this.getUid(), getDeviceInfo(request));
return new BusiResult(roomUid);
return new BusiResult<>(roomUid);
}
@ApiOperation("首页改版4.0.0-热门房间")
@Authorization
@GetMapping(value = "/hotRoom")
public BusiResult<List<PlayRoomVo>> hotRoom() throws Exception {
return BusiResult.success(homeService.hotRoom(this.getUid(), getDeviceInfo(request)));
}
@ApiOperation("首页改版4.0.0-派对tab(交友、开黑、点唱)，4.0.0版本开始使用")
@GetMapping(value = "/tab/homeV2")
public BusiResult<List<TopRoomTabHomeVo>> getRoomTabHomeListV2(@RequestParam(defaultValue = "1") Integer tabId,
@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "30") Integer pageSize) throws Exception {
@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "30") Integer pageSize) throws Exception {
List<TopRoomTabHomeVo> list = homeService.getRoomTabHomeListV2(tabId, pageNum, pageSize, this.getUid(), getDeviceInfo(request));
return new BusiResult<>(list);
}