From c8a21748f87bc0a23744d9fee5dec3eaaa403fdc Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 11 六月 2024 18:59:51 +0800 Subject: [PATCH] 1.提交【管理后台】-资讯管理相关接口 --- ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 171 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 137 insertions(+), 34 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..1552bc7 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 @@ -4,35 +4,42 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; +import com.ruoyi.article.controller.forepart.dto.ArticleDTO; +import com.ruoyi.article.controller.forepart.vo.ArticleCommentsVO; +import com.ruoyi.article.controller.forepart.vo.ArticleVO; +import com.ruoyi.article.controller.management.dto.MgtArticleQuery; +import com.ruoyi.article.controller.management.vo.MgtArticleVO; 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.mapper.ArticleMapper; import com.ruoyi.article.service.IArticleCommentsService; 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.domain.R; import com.ruoyi.common.core.enums.ArticleTypeEnum; import com.ruoyi.common.core.enums.AuditStatusEnum; +import com.ruoyi.common.core.utils.StringUtils; 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.SysUser; +import com.ruoyi.system.api.domain.dto.MemberDTO; import com.ruoyi.system.api.feignClient.MemberClient; -import java.io.IOException; +import com.ruoyi.system.api.feignClient.SysUserClient; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import util.HuaWeiOBSUtil; /** * <p> @@ -45,8 +52,6 @@ @Service public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements IArticleService { - @Resource - private IArticleService articleService; @Resource private IArticleCommentsService articleCommentsService; @@ -60,6 +65,9 @@ @Resource private IMemberArticleCollectionService memberArticleCollectionService; + @Resource + private SysUserClient sysUserClient; + @Override public PageDTO<ArticleVO> getArticleList(ArticleDTO articleDTO) { Page<Article> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize()); @@ -67,19 +75,23 @@ if (articleDTO.getArticleType()!=0){ wrapper.eq(Article::getArticleType,articleDTO.getArticleType()); } - wrapper.like(Article::getTitle,articleDTO.getTitle()); + if (articleDTO.getTitle()!=null){ + wrapper.like(Article::getTitle,articleDTO.getTitle()); + } 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()); + articleVO.setMemberAvatar(data.getAvatar()); } LambdaQueryWrapper<MemberLike> wrapper1 = Wrappers.lambdaQuery(); wrapper1.eq(MemberLike::getMemberId, articleDTO.getMemberId()); @@ -112,9 +124,10 @@ Page<Article> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize()); LambdaQueryWrapper< Article> wrapper= Wrappers.lambdaQuery(); wrapper.eq(Article::getMemberId,articleDTO.getMemberId()); + wrapper.eq(Article::getArticleType,2); 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,39 +135,36 @@ 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); article.setStatus(AuditStatusEnum.TO_BE_REVIEWED); article.setContent(articleDTO.getContent()); article.setTitle(articleDTO.getTitle()); - List<String> urlList=new ArrayList<>(); - if (articleDTO.getRticleImageUrl().length>0){ - for (MultipartFile file:articleDTO.getRticleImageUrl()){ - try { - String url= HuaWeiOBSUtil.obsUpload(file); - urlList.add(url); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - article.setImages(urlList.toString()); - } - articleService.saveOrUpdate(article); + article.setImages(articleDTO.getRticleImageUrl()); + 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); + + R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(), + SecurityConstants.INNER); + Member data = membeOne.getData(); + articleVO.setMemberNickname(data.getNickname()); + articleVO.setMemberAvatar(data.getAvatar()); LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId()); @@ -193,7 +203,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 +231,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 +274,102 @@ @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); + } + + @Override + public PageDTO<MgtArticleVO> getArticlePage(MgtArticleQuery query) { + // 构建查询条件 + Set<Long> sysUserIdSet = null; + Set<Long> memberIdSet = null; + if (StringUtils.isNotBlank(query.getCreateBy()) || StringUtils.isNotBlank( + query.getPhone())) { + SysUser user = new SysUser(); + user.setNickName(query.getCreateBy()); + user.setPhonenumber(query.getPhone()); + List<SysUser> sysUserList = sysUserClient.getUserListByName(user, + SecurityConstants.INNER).getData(); + sysUserIdSet = sysUserList.stream().map(SysUser::getUserId) + .collect(Collectors.toSet()); + MemberDTO memberDTO = new MemberDTO(); + memberDTO.setNickname(query.getCreateBy()); + memberDTO.setPhone(query.getPhone()); + List<Member> memberlist = memberClient.getMemberListByCondition(memberDTO, + SecurityConstants.INNER).getData(); + memberIdSet = memberlist.stream().map(Member::getId) + .collect(Collectors.toSet()); + } + // 分页查询 + Page<Article> page = this.lambdaQuery() + .in(StringUtils.isNotEmpty(sysUserIdSet), Article::getCreateBy, + sysUserIdSet) + .in(StringUtils.isNotEmpty(memberIdSet), Article::getMemberId, memberIdSet) + .eq(StringUtils.isNotNull(query.getListingStatus()), Article::getListingStatus, + query.getListingStatus()) + .like(StringUtils.isNotBlank(query.getTitle()), Article::getTitle, query.getTitle()) + .orderByDesc(Article::getStatus) + .page(new Page<>(query.getPageCurr(), query.getPageSize())); + + // 若为空直接返回 + if (StringUtils.isNotEmpty(page.getRecords())) { + return PageDTO.empty(page); + } + /*根据资讯的发布类型分别从系统用户表和会员表中查询发布人信息并封装VO*/ + PageDTO<MgtArticleVO> pageVO = PageDTO.of(page, MgtArticleVO.class); + List<MgtArticleVO> voList = pageVO.getList(); + Set<Integer> sysUserIds = voList.stream().filter(articleVO -> articleVO.getArticleType() + .equals(ArticleTypeEnum.PLATFORM_RELEASE)).map(MgtArticleVO::getCreateBy) + .map(Integer::valueOf).collect( + Collectors.toSet()); + + Map<Long, SysUser> userMap; + Map<Long, Member> memberMap; + if (StringUtils.isNotEmpty(sysUserIds)) { + List<SysUser> userList = sysUserClient.getUserList(Lists.newArrayList(sysUserIds)) + .getData(); + userMap = userList.stream().collect( + Collectors.toMap(SysUser::getUserId, Function.identity())); + } else { + userMap = null; + } + Set<Long> memIds = voList.stream().filter(articleVO -> articleVO.getArticleType() + .equals(ArticleTypeEnum.USER_POSTING)).map(MgtArticleVO::getMemberId).collect( + Collectors.toSet()); + if (StringUtils.isNotEmpty(memIds)) { + List<Member> memberList = memberClient.getMemberListByIds(memIds, + SecurityConstants.INNER) + .getData(); + memberMap = memberList.stream().collect( + Collectors.toMap(Member::getId, Function.identity())); + } else { + memberMap = null; + } + if (StringUtils.isNotNull(userMap)) { + voList.stream().filter(articleVO -> articleVO.getArticleType() + .equals(ArticleTypeEnum.PLATFORM_RELEASE)).forEach(articleVO -> { + SysUser sysUser = userMap.get(Long.valueOf(articleVO.getCreateBy())); + if (StringUtils.isNotNull(sysUser)) { + articleVO.setCreateBy(sysUser.getNickName()); + articleVO.setPhone(sysUser.getPhonenumber()); + } + }); + } + if (StringUtils.isNotNull(memberMap)) { + voList.stream().filter(articleVO -> articleVO.getArticleType() + .equals(ArticleTypeEnum.USER_POSTING)).forEach(articleVO -> { + Member member = memberMap.get(articleVO.getMemberId()); + if (StringUtils.isNotNull(member)) { + articleVO.setCreateBy(member.getNickname()); + articleVO.setPhone(member.getPhone()); + } + }); + } + return pageVO; } } -- Gitblit v1.7.1