From 614dc674db66c2d1444a0b75957fbde960f48800 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 03 六月 2024 09:54:41 +0800
Subject: [PATCH] 修改循环注入
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
index f31f625..b1d02d9 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -1,32 +1,26 @@
package com.ruoyi.article.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.article.domain.Article;
-import com.ruoyi.article.domain.ArticleComments;
-import com.ruoyi.article.domain.MemberArticleCollection;
-import com.ruoyi.article.domain.MemberLike;
-import com.ruoyi.article.dto.ArticleDTO;
-import com.ruoyi.article.dto.MemberArticleCollectionDTO;
-import com.ruoyi.article.mapper.MemberArticleCollectionMapper;
-import com.ruoyi.article.service.IArticleService;
-import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.article.vo.ArticleCommentsVO;
-import com.ruoyi.article.vo.ArticleVO;
-import com.ruoyi.article.vo.MemberArticleCollectionVO;
+import com.ruoyi.article.domain.Article;
+import com.ruoyi.article.domain.MemberArticleCollection;
+import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
+import com.ruoyi.article.controller.forepart.dto.MemberArticleCollectionDTO;
+import com.ruoyi.article.mapper.ArticleMapper;
+import com.ruoyi.article.mapper.MemberArticleCollectionMapper;
+import com.ruoyi.article.service.IMemberArticleCollectionService;
+import com.ruoyi.article.controller.forepart.vo.MemberArticleCollectionVO;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.feignClient.MemberClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
/**
* <p>
@@ -39,11 +33,9 @@
@Service
public class MemberArticleCollectionServiceImpl extends ServiceImpl<MemberArticleCollectionMapper, MemberArticleCollection> implements IMemberArticleCollectionService {
- @Resource
- private IMemberArticleCollectionService memberArticleCollectionService;
@Resource
- private IArticleService articleService;
+ private ArticleMapper articleMapper;
@Resource
private MemberClient memberClient;
@@ -61,26 +53,26 @@
wrapper.eq(MemberArticleCollection::getTargetId,memberArticleCollectionDTO.getTargetId());
if (memberArticleCollectionDTO.getState()==1){
- List<MemberArticleCollection> list = memberArticleCollectionService.list(wrapper);
+ List<MemberArticleCollection> list = this.list(wrapper);
if (list.size()==0){
MemberArticleCollection m =new MemberArticleCollection();
m.setMemberId(memberArticleCollectionDTO.getMemberId());
m.setTargetId(memberArticleCollectionDTO.getTargetId());
- memberArticleCollectionService.save(m);
+ this.save(m);
- Article byId = articleService.getById(memberArticleCollectionDTO.getTargetId());
+ Article byId = articleMapper.selectById(memberArticleCollectionDTO.getTargetId());
byId.setCollectCount(byId.getCollectCount()+1);
- articleService.saveOrUpdate(byId);
+ articleMapper.updateById(byId);
}
}else{
- List<MemberArticleCollection> list = memberArticleCollectionService.list(wrapper);
+ List<MemberArticleCollection> list = this.list(wrapper);
if (list.size()>0){
for (MemberArticleCollection memberArticleCollection:list){
- Article byId = articleService.getById(memberArticleCollection.getTargetId());
+ Article byId = articleMapper.selectById(memberArticleCollection.getTargetId());
byId.setCollectCount(byId.getCollectCount()-1);
- articleService.saveOrUpdate(byId);
- memberArticleCollectionService.removeById(memberArticleCollection);
+ articleMapper.updateById(byId);
+ this.removeById(memberArticleCollection);
}
}
@@ -92,16 +84,17 @@
Page<MemberArticleCollection> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
LambdaQueryWrapper< MemberArticleCollection> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberArticleCollection::getMemberId,articleDTO.getMemberId());
- Page<MemberArticleCollection> page1 = memberArticleCollectionService.page(page, wrapper);
+ Page<MemberArticleCollection> page1 = this.page(page, wrapper);
PageDTO<MemberArticleCollectionVO> articleCommentsVOPageDTO = PageDTO.of(page1, MemberArticleCollectionVO.class);
List<MemberArticleCollectionVO> list2 = articleCommentsVOPageDTO.getList();
for (MemberArticleCollectionVO memberArticleCollectionVO:list2){
- Article byId = articleService.getById(memberArticleCollectionVO.getTargetId());
+ Article byId = articleMapper.selectById(memberArticleCollectionVO.getTargetId());
memberArticleCollectionVO.setContent(byId.getContent());
memberArticleCollectionVO.setImages(byId.getImages());
memberArticleCollectionVO.setTitle(byId.getTitle());
- R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId());
+ R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(),
+ SecurityConstants.INNER);
Member data = membeOne.getData();
memberArticleCollectionVO.setMemberNickname(data.getNickname());
memberArticleCollectionVO.setIsCollect(1);
--
Gitblit v1.7.1