Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

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

@@ -16,24 +16,22 @@
import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.feignClient.MemberClient;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import util.HuaWeiOBSUtil;

import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

/**
 * <p>
@@ -78,7 +76,8 @@
        List<ArticleVO> list2 = articleCommentsVOPageDTO.getList();
        for (ArticleVO articleVO:list2) {
            if (articleVO.getMemberId()!=null){
                R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId());
                R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
                        SecurityConstants.INNER);
                Member data = membeOne.getData();
                articleVO.setMemberNickname(data.getNickname());
            }
@@ -194,7 +193,8 @@
        PageDTO<ArticleCommentsVO> articleCommentsVOPageDTO = PageDTO.of(page1, ArticleCommentsVO.class);
        List<ArticleCommentsVO> list2 = articleCommentsVOPageDTO.getList();
        for(ArticleCommentsVO articleCommentsVO:list2){
            R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId());
            R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
                    SecurityConstants.INNER);
            Member data = membeOne.getData();
            articleCommentsVO.setMemberNickname(data.getNickname());
            articleCommentsVO.setBmemberNickavatar(data.getAvatar());
@@ -221,10 +221,12 @@
            for (ArticleComments articleComments1:list1){
                ArticleCommentsVO articleCommentsVO1=new ArticleCommentsVO();

                R<Member> membeOne1 = memberClient.getMembeOne(articleCommentsVO.getMemberId());
                R<Member> membeOne1 = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
                        SecurityConstants.INNER);
                Member data1 = membeOne1.getData();

                R<Member> membeOne2 = memberClient.getMembeOne(articleCommentsVO.getBmemberId());
                R<Member> membeOne2 = memberClient.getMembeOne(articleCommentsVO.getBmemberId(),
                        SecurityConstants.INNER);
                Member data2 = membeOne2.getData();

                articleCommentsVO1.setArticleId(articleComments1.getArticleId());
@@ -263,7 +265,8 @@
    @Override
    public void getReport(ArticleDTO articleDTO) {
       Article article= articleService.getById(articleDTO.getId());
        R<Member> membeOne = memberClient.getMembeOne(articleDTO.getMemberId());
        R<Member> membeOne = memberClient.getMembeOne(articleDTO.getMemberId(),
                SecurityConstants.INNER);
        Member data = membeOne.getData();
        article.setReportBy(data.getNickname());
        article.setReportedTime(LocalDateTime.now());