From b29becf95484be48aa09e87fcc7cc19f94cf9c81 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 199 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 128 insertions(+), 71 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 4e43392..5fdd992 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
@@ -8,8 +8,10 @@
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.MgtArticleAuditDTO;
import com.ruoyi.article.controller.management.dto.MgtArticleDTO;
import com.ruoyi.article.controller.management.dto.MgtArticleQuery;
+import com.ruoyi.article.controller.management.dto.MgtArticleUpdDTO;
import com.ruoyi.article.controller.management.vo.MgtArticleVO;
import com.ruoyi.article.domain.Article;
import com.ruoyi.article.domain.ArticleComments;
@@ -80,6 +82,7 @@
if (articleDTO.getTitle()!=null){
wrapper.like(Article::getTitle,articleDTO.getTitle());
}
+ wrapper.eq(Article::getListingStatus,0);
wrapper.eq(Article::getStatus,2);
wrapper.eq( Article::getDelFlag,0);
wrapper.orderByDesc(Article::getCreateTime);
@@ -94,6 +97,9 @@
Member data = membeOne.getData();
articleVO.setMemberNickname(data.getNickname());
articleVO.setMemberAvatar(data.getAvatar());
+ }else{
+ articleVO.setMemberNickname("平台发布");
+ articleVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
}
LambdaQueryWrapper<MemberLike> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(MemberLike::getMemberId, articleDTO.getMemberId());
@@ -158,14 +164,24 @@
@Override
public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) {
Article article=this.getById(articleDTO.getId());
+ if (StringUtils.isNull(article)) {
+ throw new ServiceException("资讯不存在了");
+ }
ArticleVO articleVO = BeanUtils.copyBean(article,
ArticleVO.class);
- R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
- SecurityConstants.INNER);
- Member data = membeOne.getData();
- articleVO.setMemberNickname(data.getNickname());
- articleVO.setMemberAvatar(data.getAvatar());
+ if(articleVO!=null){
+ R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
+ SecurityConstants.INNER);
+ Member data = membeOne.getData();
+ if (data!=null){
+ articleVO.setMemberNickname(data.getNickname());
+ articleVO.setMemberAvatar(data.getAvatar());
+ }
+ }else{
+ articleVO.setMemberNickname("平台发布");
+ articleVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+ }
LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId());
wrapper1.eq(MemberLike::getArticleId,article.getId());
@@ -202,72 +218,80 @@
Page<ArticleComments> page1 = articleCommentsService.page(page, wrapper);
PageDTO<ArticleCommentsVO> articleCommentsVOPageDTO = PageDTO.of(page1, ArticleCommentsVO.class);
List<ArticleCommentsVO> list2 = articleCommentsVOPageDTO.getList();
- for(ArticleCommentsVO articleCommentsVO:list2){
- R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
- SecurityConstants.INNER);
- Member data = membeOne.getData();
- articleCommentsVO.setMemberNickname(data.getNickname());
- articleCommentsVO.setBmemberNickavatar(data.getAvatar());
- LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
- wrapper1.eq(MemberLike::getArticleId,articleCommentsVO.getArticleId());
- wrapper1.eq(MemberLike::getType,2);
- wrapper1.eq( MemberLike::getDelFlag,0);
- List<MemberLike> list = memberLikeService.list(wrapper1);
- if (list.size()>0){
- articleCommentsVO.setIslike(1);
- }else {
- articleCommentsVO.setIslike(2);
- }
-
-
- List<ArticleCommentsVO> articleCommentsVOList1=new ArrayList<>();
-
- LambdaQueryWrapper< ArticleComments> wrapper2= Wrappers.lambdaQuery();
- wrapper2.eq(ArticleComments::getReplyId,articleCommentsVO.getArticleId());
- wrapper2.eq( ArticleComments::getDelFlag,0);
- wrapper2.eq( ArticleComments::getType,2);
- List<ArticleComments> list1 = articleCommentsService.list(wrapper2);
- for (ArticleComments articleComments1:list1){
- ArticleCommentsVO articleCommentsVO1=new ArticleCommentsVO();
-
- R<Member> membeOne1 = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
+ if (list2!=null){
+ for(int i=0;i<list2.size();i++){
+ ArticleCommentsVO articleCommentsVO=list2.get(i);
+ R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
SecurityConstants.INNER);
- Member data1 = membeOne1.getData();
-
- R<Member> membeOne2 = memberClient.getMembeOne(articleCommentsVO.getBmemberId(),
- SecurityConstants.INNER);
- Member data2 = membeOne2.getData();
-
- articleCommentsVO1.setArticleId(articleComments1.getArticleId());
- articleCommentsVO1.setContent(articleComments1.getContent());
- articleCommentsVO1.setMemberId(articleComments1.getMemberId());
- articleCommentsVO1.setId(articleComments1.getId());
- articleCommentsVO1.setMemberNickname(data1.getNickname());
- articleCommentsVO1.setBmemberNickavatar(data1.getAvatar());
- articleCommentsVO1.setLikeCount(articleComments1.getLikeCount());
- articleCommentsVO1.setCreateTime(articleComments1.getCreateTime());
- articleCommentsVO1.setBmemberNickavatar(data2.getAvatar());
- articleCommentsVO1.setBmemberNickname(data2.getNickname());
-
- LambdaQueryWrapper<MemberLike> wrapper3= Wrappers.lambdaQuery();
- wrapper3.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
- wrapper3.eq(MemberLike::getArticleId,articleCommentsVO.getArticleId());
- wrapper3.eq(MemberLike::getType,2);
- wrapper3.eq( MemberLike::getDelFlag,0);
- List<MemberLike> list3 = memberLikeService.list(wrapper3);
- if (list3.size()>0){
- articleCommentsVO1.setIslike(1);
+ Member data = membeOne.getData();
+ articleCommentsVO.setMemberNickname(data.getNickname());
+ articleCommentsVO.setMemberNickavatar(data.getAvatar());
+ LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
+ wrapper1.eq(MemberLike::getArticleId,articleCommentsVO.getId());
+ wrapper1.eq(MemberLike::getType,2);
+ wrapper1.eq( MemberLike::getDelFlag,0);
+ List<MemberLike> list = memberLikeService.list(wrapper1);
+ if (list.size()>0){
+ articleCommentsVO.setIslike(1);
}else {
- articleCommentsVO1.setIslike(2);
+ articleCommentsVO.setIslike(2);
}
- articleCommentsVOList1.add(articleCommentsVO1);
+
+
+ List<ArticleCommentsVO> articleCommentsVOList1=new ArrayList<>();
+
+ LambdaQueryWrapper< ArticleComments> wrapper2= Wrappers.lambdaQuery();
+ wrapper2.eq(ArticleComments::getReplyId,articleCommentsVO.getId());
+ wrapper2.eq( ArticleComments::getDelFlag,0);
+ wrapper2.eq( ArticleComments::getType,2);
+ List<ArticleComments> list1 = articleCommentsService.list(wrapper2);
+ for (ArticleComments articleComments1:list1){
+ ArticleCommentsVO articleCommentsVO1=new ArticleCommentsVO();
+
+ R<Member> membeOne1 = memberClient.getMembeOne(articleComments1.getMemberId(),
+ SecurityConstants.INNER);
+ Member data1 = membeOne1.getData();
+
+
+
+ R<Member> membeOne2 = memberClient.getMembeOne(articleComments1.getBmemberId(),
+ SecurityConstants.INNER);
+ Member data2 = membeOne2.getData();
+
+ articleCommentsVO1.setArticleId(articleComments1.getArticleId());
+ articleCommentsVO1.setContent(articleComments1.getContent());
+ articleCommentsVO1.setMemberId(articleComments1.getMemberId());
+ articleCommentsVO1.setId(articleComments1.getId());
+ articleCommentsVO1.setMemberNickname(data1.getNickname());
+ articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
+ articleCommentsVO1.setBmemberNickavatar(data1.getAvatar());
+ articleCommentsVO1.setLikeCount(articleComments1.getLikeCount());
+ articleCommentsVO1.setCreateTime(articleComments1.getCreateTime());
+ articleCommentsVO1.setBmemberNickname(data2.getNickname());
+ articleCommentsVO1.setBmemberNickavatar(data2.getNickname());
+ articleCommentsVO1.setState(articleComments1.getState());
+ articleCommentsVO1.setBmemberId(data2.getId());
+
+ LambdaQueryWrapper<MemberLike> wrapper3= Wrappers.lambdaQuery();
+ wrapper3.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
+ wrapper3.eq(MemberLike::getArticleId,articleComments1.getId());
+ wrapper3.eq(MemberLike::getType,2);
+ wrapper3.eq( MemberLike::getDelFlag,0);
+ List<MemberLike> list3 = memberLikeService.list(wrapper3);
+ if (list3.size()>0){
+ articleCommentsVO1.setIslike(1);
+ }else {
+ articleCommentsVO1.setIslike(2);
+ }
+ articleCommentsVOList1.add(articleCommentsVO1);
+ }
+
+ articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);
+
}
-
- articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);
-
- list2.add(articleCommentsVO);
}
+
return articleCommentsVOPageDTO;
}
@@ -295,6 +319,7 @@
// 构建查询条件
Set<Long> sysUserIdSet = null;
Set<Long> memberIdSet = null;
+ Page<Article> page = new Page<>(query.getPageCurr(), query.getPageSize());
if (StringUtils.isNotBlank(query.getCreateBy()) || StringUtils.isNotBlank(
query.getPhone())) {
SysUser user = new SysUser();
@@ -311,20 +336,23 @@
SecurityConstants.INNER).getData();
memberIdSet = memberlist.stream().map(Member::getId)
.collect(Collectors.toSet());
+ if (StringUtils.isEmpty(sysUserIdSet) && StringUtils.isEmpty(memberIdSet)) {
+ return PageDTO.empty(page);
+ }
}
// 分页查询
- Page<Article> page = this.lambdaQuery()
+ 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)
+ .orderByDesc(Article::getReported)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
// 若为空直接返回
- if (StringUtils.isNotEmpty(page.getRecords())) {
+ if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
/*根据资讯的发布类型分别从系统用户表和会员表中查询发布人信息并封装VO*/
@@ -350,8 +378,7 @@
Collectors.toSet());
if (StringUtils.isNotEmpty(memIds)) {
List<Member> memberList = memberClient.getMemberListByIds(memIds,
- SecurityConstants.INNER)
- .getData();
+ SecurityConstants.INNER).getData();
memberMap = memberList.stream().collect(
Collectors.toMap(Member::getId, Function.identity()));
} else {
@@ -390,6 +417,7 @@
Article article = BeanUtils.copyBean(dto, Article.class);
if (StringUtils.isNull(article.getId())) {
article.setStatus(AuditStatusEnum.PASSED);
+ article.setArticleType(ArticleTypeEnum.PLATFORM_RELEASE);
this.save(article);
} else {
Article articleById = this.getById(article.getId());
@@ -432,4 +460,33 @@
}
return BeanUtils.copyBean(article, MgtArticleVO.class);
}
+
+ /**
+ * 资讯审核
+ *
+ * @param dto 管理后台-资讯审核传输对象
+ */
+ @Override
+ public void audit(MgtArticleAuditDTO dto) {
+ Article article = this.getById(dto.getId());
+ if (StringUtils.isNull(article)) {
+ throw new ServiceException("资讯不存在");
+ }
+ article.setStatus(dto.getStatus());
+ if (AuditStatusEnum.REJECTED.equals(dto.getStatus())) {
+ article.setRefuseComment(dto.getRefuseComment());
+ }
+ this.updateById(article);
+ }
+
+ /**
+ * 上架/下架
+ *
+ * @param dto 资讯上下架数据传输对象
+ */
+ @Override
+ public void updStatus(MgtArticleUpdDTO dto) {
+ this.lambdaUpdate().set(Article::getListingStatus, dto.getListingStatus())
+ .eq(Article::getId, dto.getId()).update();
+ }
}
--
Gitblit v1.7.1