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-09 17:54:27 +08:00
parent c1a55cf9e1
commit 3c6b6fa1ae
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicFollowQryExe.java
View File

@ -62,7 +62,7 @@ public class DynamicFollowQryExe {
// 获取关注人列表
List<UserSubscription> userSubscriptions = userSubscriptionService
.listByUserId(cmd.requiredReqUserId(), null);
.listByUserId(cmd.requiredReqUserId(), null, null);
if (CollectionUtils.isEmpty(userSubscriptions)) {
return Lists.newArrayList();

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/query/RecommendUserQueryExe.java
View File

@ -73,7 +73,7 @@ public class RecommendUserQueryExe {
// 用户关注列表
Set<Long> userSubscriptions = userSubscriptionService.listByUserId(
cmd.getReqUserId(),null).stream().map(UserSubscription::getSubscribeUserId)
cmd.getReqUserId(),null, null).stream().map(UserSubscription::getSubscribeUserId)
.collect(Collectors.toSet());
userIds.addAll(userSubscriptions);
// 用户好友列表

15
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserRelationFollowQryExe.java
View File

@ -10,12 +10,12 @@ import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.infra.database.rds.entity.user.user.UserSubscription;
import com.red.circle.other.infra.database.rds.service.user.user.UserSubscriptionService;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
/**
* 用户关系订阅列表
@ -32,8 +32,15 @@ public class UserRelationFollowQryExe {
private final UserSubscriptionService userSubscriptionService;
public List<UserSupportRelationCO> execute(AppFlowCmd cmd) {
Long subscriptionUserId = null;
if (StringUtils.hasText(cmd.getAccount())) {
subscriptionUserId = Optional.ofNullable(userProfileGateway.getByAccount(cmd.getReqSysOrigin().getOrigin(), cmd.getAccount()))
.map(UserProfile::getId)
.orElse(-1L);
}
List<UserSubscription> userSubscriptions = userSubscriptionService
.listByUserId(cmd.requiredReqUserId(), cmd.getLastId());
.listByUserId(cmd.requiredReqUserId(), cmd.getLastId(), subscriptionUserId);
if (CollectionUtils.isEmpty(userSubscriptions)) {
return Lists.newArrayList();

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/user/user/UserSubscriptionService.java
View File

@ -51,7 +51,7 @@ public interface UserSubscriptionService extends BaseService<UserSubscription> {
* @param lastId ignore
* @return ignore
*/
List<UserSubscription> listByUserId(Long userId, Long lastId);
List<UserSubscription> listByUserId(Long userId, Long lastId, Long subscriptionUserId );
/**
* 获取订阅我的用于列表.

3
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/user/user/impl/UserSubscriptionServiceImpl.java
View File

@ -61,9 +61,10 @@ public class UserSubscriptionServiceImpl extends
}
@Override
public List<UserSubscription> listByUserId(Long userId, Long lastId) {
public List<UserSubscription> listByUserId(Long userId, Long lastId, Long subscriptionUserId) {
return query()
.eq(UserSubscription::getUserId, userId)
.eq(Objects.nonNull(subscriptionUserId), UserSubscription::getSubscribeUserId, subscriptionUserId)
.lt(Objects.nonNull(lastId), UserSubscription::getId, lastId)
.orderByDesc(UserSubscription::getId)
.last(PageConstant.DEFAULT_LIMIT)