diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java index 4a98569..369697e 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java @@ -20,6 +20,8 @@ public class AppUserDynamic extends BaseEntity /** */ private Long id; + private Long appId; + /** 关联用户id */ @Excel(name = "关联用户id") private Long userId; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java index ab8e4d6..28741f7 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java @@ -32,6 +32,9 @@ public class AppUserDynamicVo extends AppUserDynamic @Excel(name = "学历") private String education; + @Excel(name = "是否点赞:0是1否") + private Integer isLike; + @Excel(name = "学校") private Long school; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index 1ae7af5..5871be1 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.app.service.impl; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import com.ruoyi.app.domain.AppDynamicComment; import com.ruoyi.app.domain.AppDynamicImg; @@ -71,8 +72,8 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService */ @Override public int insertAppUserDynamic(AppUserDynamic appUserDynamic) { - appUserDynamicMapper.insertAppUserDynamic(appUserDynamic); appUserDynamic.setCreateTime(DateUtils.getNowDate()); + appUserDynamicMapper.insertAppUserDynamic(appUserDynamic); if (StringUtils.isNotBlank(appUserDynamic.getImgUrls())) { List imgs = Arrays.asList(appUserDynamic.getImgUrls().split(",")); for (String img : imgs) { @@ -153,7 +154,12 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService // 点赞数 AppDynamicLike appDynamicLike = new AppDynamicLike(); appDynamicLike.setDynamicId(id); - appUserDynamicVo.setCountLike(appDynamicLikeMapper.selectAppDynamicLikeList(appDynamicLike).size()); + List userIds = appDynamicLikeMapper.selectAppDynamicLikeList(appDynamicLike).stream().map(x->x.getUserId()).collect(Collectors.toList()); + appUserDynamicVo.setCountLike(userIds.size()); + // 是否点赞 + if (appUserDynamic.getAppId() != null) { + appUserDynamicVo.setIsLike(userIds.contains(appUserDynamic.getUserId()) ? 0 : 1); + } // 评论数 AppDynamicComment appDynamicComment = new AppDynamicComment(); appDynamicComment.setDynamicId(id);