From e59e26244b2a07b9d8360551cbab75c6fd8a1248 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 15:15:21 +0800
Subject: [PATCH] 修改循环注入
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index bc8b1e9..a4a9761 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -14,10 +14,9 @@
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.service.IMemberLikeService;
-import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.vo.ArticleCommentsVO;
-import com.ruoyi.common.core.constant.SecurityConstants;
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;
@@ -25,6 +24,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.feignClient.MemberClient;
+import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -32,7 +32,6 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import util.HuaWeiOBSUtil;
/**
* <p>
@@ -45,8 +44,6 @@
@Service
public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements IArticleService {
- @Resource
- private IArticleService articleService;
@Resource
private IArticleCommentsService articleCommentsService;
@@ -71,13 +68,14 @@
wrapper.eq(Article::getStatus,2);
wrapper.eq( Article::getDelFlag,0);
wrapper.orderByDesc(Article::getCreateTime);
- Page< Article> page1 = articleService.page(page, wrapper);
+ Page< Article> page1 = this.page(page, wrapper);
PageDTO<ArticleVO> articleCommentsVOPageDTO = PageDTO.of(page1, ArticleVO.class);
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());
}
@@ -114,7 +112,7 @@
wrapper.eq(Article::getMemberId,articleDTO.getMemberId());
wrapper.eq( Article::getDelFlag,0);
wrapper.orderByDesc(Article::getCreateTime);
- Page<Article> page1 = articleService.page(page, wrapper);
+ Page<Article> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
@@ -122,7 +120,7 @@
public void saveMemberArticle(ArticleDTO articleDTO) {
Article article=new Article();
if (articleDTO.getId()!=null){
- article=articleService.getById(articleDTO.getId());
+ article=this.getById(articleDTO.getId());
}
article.setMemberId(articleDTO.getMemberId());
article.setArticleType(ArticleTypeEnum.USER_POSTING);
@@ -141,18 +139,18 @@
}
article.setImages(urlList.toString());
}
- articleService.saveOrUpdate(article);
+ this.saveOrUpdate(article);
}
@Override
public void delMemberArticle(ArticleDTO articleDTO) {
- articleService.removeById(articleDTO.getId());
+ this.removeById(articleDTO.getId());
}
@Override
public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) {
- Article article=articleService.getById(articleDTO.getId());
+ Article article=this.getById(articleDTO.getId());
ArticleVO articleVO=new ArticleVO();
BeanUtils.copyProperties(article, articleVO);
@@ -193,7 +191,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());
@@ -220,10 +219,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());
@@ -261,12 +262,12 @@
@Override
public void getReport(ArticleDTO articleDTO) {
- Article article= articleService.getById(articleDTO.getId());
+ Article article= this.getById(articleDTO.getId());
R<Member> membeOne = memberClient.getMembeOne(articleDTO.getMemberId(),
SecurityConstants.INNER);
Member data = membeOne.getData();
article.setReportBy(data.getNickname());
article.setReportedTime(LocalDateTime.now());
- articleService.saveOrUpdate(article);
+ this.saveOrUpdate(article);
}
}
--
Gitblit v1.7.1