Merge remote-tracking branch 'origin/master'

mitao

2024-07-17 e2659d65be6494f9f737cddcec8292ac39cc5c06

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java

@@ -36,9 +36,11 @@
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -224,8 +226,14 @@
                R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
                        SecurityConstants.INNER);
                Member data = membeOne.getData();
                articleCommentsVO.setMemberNickname(data.getNickname());
                articleCommentsVO.setMemberNickavatar(data.getAvatar());
                if (data!=null){
                    articleCommentsVO.setMemberNickname(data.getNickname());
                    articleCommentsVO.setMemberNickavatar(data.getAvatar());
                }else{
                    articleCommentsVO.setMemberNickname("平台发布");
                    articleCommentsVO.setMemberNickavatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                }

                LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
                wrapper1.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
                wrapper1.eq(MemberLike::getArticleId,articleCommentsVO.getId());
@@ -263,13 +271,19 @@
                    articleCommentsVO1.setContent(articleComments1.getContent());
                    articleCommentsVO1.setMemberId(articleComments1.getMemberId());
                    articleCommentsVO1.setId(articleComments1.getId());
                    articleCommentsVO1.setMemberNickname(data1.getNickname());
                    articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
                    articleCommentsVO1.setBmemberNickavatar(data1.getAvatar());
                    if (data1!=null){
                        articleCommentsVO1.setMemberNickname(data1.getNickname());
                        articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
                    }


                    articleCommentsVO1.setLikeCount(articleComments1.getLikeCount());
                    articleCommentsVO1.setCreateTime(articleComments1.getCreateTime());
                    articleCommentsVO1.setBmemberNickname(data2.getNickname());
                    articleCommentsVO1.setBmemberNickavatar(data2.getNickname());
                    if (data2!=null){
                        articleCommentsVO1.setBmemberNickname(data2.getNickname());
                        articleCommentsVO1.setBmemberNickavatar(data2.getAvatar());
                    }

                    articleCommentsVO1.setState(articleComments1.getState());
                    articleCommentsVO1.setBmemberId(data2.getId());

@@ -284,7 +298,10 @@
                    }else {
                        articleCommentsVO1.setIslike(2);
                    }
                    articleCommentsVOList1.add(articleCommentsVO1);
                    if (data1!=null){
                        articleCommentsVOList1.add(articleCommentsVO1);
                    }

                }

                articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);
@@ -347,6 +364,8 @@
                .in(StringUtils.isNotEmpty(memberIdSet), Article::getMemberId, memberIdSet)
                .eq(StringUtils.isNotNull(query.getListingStatus()), Article::getListingStatus,
                        query.getListingStatus())
                .eq(StringUtils.isNotNull(query.getArticleType()), Article::getArticleType,
                        query.getArticleType())
                .like(StringUtils.isNotBlank(query.getTitle()), Article::getTitle, query.getTitle())
                .orderByDesc(Article::getReported)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
@@ -376,6 +395,10 @@
        Set<Long> memIds = voList.stream().filter(articleVO -> articleVO.getArticleType()
                .equals(ArticleTypeEnum.USER_POSTING)).map(MgtArticleVO::getMemberId).collect(
                Collectors.toSet());
        Set<Long> memIds2 = voList.stream().map(MgtArticleVO::getReportBy).filter(
                Objects::nonNull).map(Long::valueOf).collect(
                Collectors.toSet());
        memIds.addAll(memIds2);
        if (StringUtils.isNotEmpty(memIds)) {
            List<Member> memberList = memberClient.getMemberListByIds(memIds,
                    SecurityConstants.INNER).getData();
@@ -384,7 +407,7 @@
        } else {
            memberMap = null;
        }
        if (StringUtils.isNotNull(userMap)) {
        if (StringUtils.isNotEmpty(userMap)) {
            voList.stream().filter(articleVO -> articleVO.getArticleType()
                    .equals(ArticleTypeEnum.PLATFORM_RELEASE)).forEach(articleVO -> {
                SysUser sysUser = userMap.get(Long.valueOf(articleVO.getCreateBy()));
@@ -394,7 +417,7 @@
                }
            });
        }
        if (StringUtils.isNotNull(memberMap)) {
        if (StringUtils.isNotEmpty(memberMap)) {
            voList.stream().filter(articleVO -> articleVO.getArticleType()
                    .equals(ArticleTypeEnum.USER_POSTING)).forEach(articleVO -> {
                Member member = memberMap.get(articleVO.getMemberId());
@@ -403,6 +426,13 @@
                    articleVO.setPhone(member.getPhone());
                }
            });
            voList.stream().filter(articleVO -> articleVO.getReported().equals(Boolean.TRUE))
                    .peek(articleVO -> {
                        Member member = memberMap.get(Long.valueOf(articleVO.getReportBy()));
                        if (StringUtils.isNotNull(member)) {
                            articleVO.setReportBy(member.getNickname());
                        }
                    }).collect(Collectors.toList());
        }
        return pageVO;
    }