From 139ca18eb3612f8f19a3ee90c5f2e49dcde72cca Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Tue, 23 Apr 2024 00:11:58 +0800 Subject: [PATCH] init --- .../main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java | 2 ++ .../src/main/java/com/ruoyi/xq/service/UserStarService.java | 2 ++ .../main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java | 4 ++++ .../java/com/ruoyi/xq/service/impl/UserStarServiceImpl.java | 5 +++++ 4 files changed, 13 insertions(+) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java index 2d92d60..bf54216 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java @@ -17,6 +17,8 @@ public class HomeUserVo { private String usercode; @Schema(description = "用户头像") private String avatar; + @Schema(description = "是否关注") + private Boolean star = false; @Schema(description = "相册") private List userPictureList; @Schema(description = "自我描述") diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStarService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStarService.java index fafd17a..f3c28f3 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStarService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStarService.java @@ -20,4 +20,6 @@ public interface UserStarService extends IService { void starUpdate(UserStarReq req); Page pageApp(PageQuery pageQuery, UserStarQuery query); + + boolean existsStar(Long userId, Long starUserId); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java index b68b60b..1b869b5 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java @@ -80,6 +80,8 @@ public class UserServiceImpl extends ServiceImpl implements Use private RedissonClient redissonClient; @Autowired private AreaCodeService areaCodeService; + @Autowired + private UserStarService userStarService; @Override public MinUser getMinUserById(Long userId){ @@ -126,6 +128,8 @@ public class UserServiceImpl extends ServiceImpl implements Use if(userId.equals(currentUserId)){ return result; } + boolean star = userStarService.existsStar(currentUserId, userId); + result.setStar(star); UserStatus userStatus = userStatusService.getByUserId(userId); boolean showAvatar = this.showAvatar(LoginHelper.getUserId(), userStatus.getShowAvatar()); if(!showAvatar){ diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStarServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStarServiceImpl.java index 97729b9..05aca0d 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStarServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStarServiceImpl.java @@ -70,4 +70,9 @@ public class UserStarServiceImpl extends ServiceImpl im throw new ServiceException("参数异常"); } } + + @Override + public boolean existsStar(Long userId, Long starUserId) { + return this.exists(Wrappers.lambdaQuery(UserStar.class).eq(UserStar::getUserId, userId).eq(UserStar::getStarUserId, starUserId)); + } }