hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

家族列表接口修改

Browse Source
This commit is contained in:
tianfeng 2025-12-26 18:01:25 +08:00
parent 19af3ba254
commit d80f94ecc7
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java
View File

@ -26,11 +26,7 @@ import com.red.circle.other.inner.model.dto.famliy.FamilyDetailsDTO;
import com.red.circle.tool.core.collection.CollectionUtils; import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.num.NumUtils; import com.red.circle.tool.core.num.NumUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Comparator; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -87,18 +83,12 @@ public class FamilyHomeListExe {
} }
private List<FamilyBaseInfo> getFamilyList(FamilyHomeListCmd cmd) { private List<FamilyBaseInfo> getFamilyList(FamilyHomeListCmd cmd) {
IPage<FamilyBaseInfo> page = new Page<>(); FamilyMemberInfo familyMemberInfo = familyMemberInfoService.getFamilyMemberByUserId(cmd.getReqUserId());
page.setCurrent(cmd.getCurrent()); if (familyMemberInfo == null) {
page.setSize(cmd.getSize()); return Collections.emptyList();
}
return familyBaseInfoService.page( return List.of(familyBaseInfoService.getBaseInfoById(familyMemberInfo.getId()));
page,
familyBaseInfoService.query()
.eq(FamilyBaseInfo::getSysOrigin, cmd.requireReqSysOrigin())
.eq(FamilyBaseInfo::getFamilyStatus, FamilyStatusEnum.NORMAL.name())
.orderByDesc(FamilyBaseInfo::getCreateTime)
.getWrapper()
).getRecords();
} }
private FamilyHomeListCO buildFamilyHomeCO(FamilyHomeListCmd cmd, FamilyBaseInfo family, BigDecimal totalExp) { private FamilyHomeListCO buildFamilyHomeCO(FamilyHomeListCmd cmd, FamilyBaseInfo family, BigDecimal totalExp) {
@ -119,7 +109,7 @@ public class FamilyHomeListExe {
List<FamilyHomeMemberCO> displayMembers = buildDisplayMembers(cmd, members, onlineUserIds); List<FamilyHomeMemberCO> displayMembers = buildDisplayMembers(cmd, members, onlineUserIds);
List<ActiveVoiceRoom> onlineRooms = activeVoiceRoomService.listByFamilyId(family.getId(), 4); List<ActiveVoiceRoom> onlineRooms = activeVoiceRoomService.listByFamilyId(family.getId(), 30);
List<FamilyHomeRoomCO> roomCOs = buildRoomCOs(onlineRooms); List<FamilyHomeRoomCO> roomCOs = buildRoomCOs(onlineRooms);
return new FamilyHomeListCO() return new FamilyHomeListCO()