From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 353 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 272 insertions(+), 81 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 1552bc7..f1f02a5 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,7 +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;
@@ -23,9 +26,12 @@
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.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.utils.page.BeanUtils;
+import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.MemberDTO;
@@ -35,11 +41,13 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
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.transaction.annotation.Transactional;
/**
* <p>
@@ -78,6 +86,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);
@@ -92,6 +101,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());
@@ -156,16 +168,24 @@
@Override
public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) {
Article article=this.getById(articleDTO.getId());
- ArticleVO articleVO=new ArticleVO();
+ if (StringUtils.isNull(article)) {
+ throw new ServiceException("资讯不存在了");
+ }
+ ArticleVO articleVO = BeanUtils.copyBean(article,
+ ArticleVO.class);
+ 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());
- 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());
-
+ }
+ }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());
@@ -193,6 +213,8 @@
@Override
public PageDTO<ArticleCommentsVO> getArticleCommentsList(ArticleDTO articleDTO) {
+ Long userId = SecurityUtils.getUserId();
+ Member member = memberClient.getMemberByUserId(userId, SecurityConstants.INNER).getData();
Page<ArticleComments> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
LambdaQueryWrapper< ArticleComments> wrapper= Wrappers.lambdaQuery();
wrapper.eq(ArticleComments::getArticleId,articleDTO.getId());
@@ -202,72 +224,94 @@
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);
- }else {
- articleCommentsVO1.setIslike(2);
+ Member data = membeOne.getData();
+ if (data!=null){
+ articleCommentsVO.setMemberNickname(data.getNickname());
+ articleCommentsVO.setMemberNickavatar(data.getAvatar());
+ }else{
+ articleCommentsVO.setMemberNickname("平台发布");
+ articleCommentsVO.setMemberNickavatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
}
- articleCommentsVOList1.add(articleCommentsVO1);
+
+ LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(MemberLike::getMemberId, member.getId());
+ 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 {
+ articleCommentsVO.setIslike(2);
+ }
+
+
+ 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());
+ if (data1!=null){
+ articleCommentsVO1.setMemberNickname(data1.getNickname());
+ articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
+ }
+
+
+ articleCommentsVO1.setLikeCount(articleComments1.getLikeCount());
+ articleCommentsVO1.setCreateTime(articleComments1.getCreateTime());
+ if (data2!=null){
+ articleCommentsVO1.setBmemberNickname(data2.getNickname());
+ articleCommentsVO1.setBmemberNickavatar(data2.getAvatar());
+ articleCommentsVO1.setBmemberId(data2.getId());
+ }
+
+ articleCommentsVO1.setState(articleComments1.getState());
+ 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);
+ }
+ if (data1!=null){
+ articleCommentsVOList1.add(articleCommentsVO1);
+ }
+
+ }
+
+ articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);
+
}
-
- articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);
-
- list2.add(articleCommentsVO);
}
+
return articleCommentsVOPageDTO;
}
@@ -278,16 +322,24 @@
R<Member> membeOne = memberClient.getMembeOne(articleDTO.getMemberId(),
SecurityConstants.INNER);
Member data = membeOne.getData();
- article.setReportBy(data.getNickname());
+ article.setReportBy(data.getId());
article.setReportedTime(LocalDateTime.now());
+ article.setReported(Boolean.TRUE);
this.saveOrUpdate(article);
}
+ /**
+ * 获取资讯列表的分页数据
+ *
+ * @param query 资讯管理查询条件
+ * @return PageDTO<ArticleVO>
+ */
@Override
public PageDTO<MgtArticleVO> getArticlePage(MgtArticleQuery query) {
// 构建查询条件
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();
@@ -295,29 +347,45 @@
user.setPhonenumber(query.getPhone());
List<SysUser> sysUserList = sysUserClient.getUserListByName(user,
SecurityConstants.INNER).getData();
+ if (CollUtils.isNotEmpty(sysUserList)) {
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)
+ if (CollUtils.isNotEmpty(memberlist)) {
+ 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)
+ .or()
.in(StringUtils.isNotEmpty(memberIdSet), Article::getMemberId, memberIdSet)
.eq(StringUtils.isNotNull(query.getListingStatus()), Article::getListingStatus,
query.getListingStatus())
+ .eq(StringUtils.isNotNull(query.getArticleType()), Article::getArticleType,
+ query.getArticleType())
+ .eq(StringUtils.isNotNull(query.getStatus()), Article::getStatus,
+ query.getStatus())
+ .in(StringUtils.isNotNull(query.getArticleType()) && query.getArticleType()
+ .equals(ArticleTypeEnum.USER_POSTING), Article::getStatus,
+ Lists.newArrayList(AuditStatusEnum.TO_BE_REVIEWED,
+ AuditStatusEnum.REJECTED))
.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*/
@@ -341,35 +409,158 @@
Set<Long> memIds = voList.stream().filter(articleVO -> articleVO.getArticleType()
.equals(ArticleTypeEnum.USER_POSTING)).map(MgtArticleVO::getMemberId).collect(
Collectors.toSet());
+ Set<Long> memIds2 = voList.stream().map(MgtArticleVO::getReportBy).filter(
+ Objects::nonNull).map(Long::valueOf).collect(
+ Collectors.toSet());
+ memIds.addAll(memIds2);
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 {
memberMap = null;
}
- if (StringUtils.isNotNull(userMap)) {
+ if (StringUtils.isNotEmpty(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());
+ } else {
+ articleVO.setCreateBy(null);
}
});
}
- if (StringUtils.isNotNull(memberMap)) {
+ if (StringUtils.isNotEmpty(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());
+ } else {
+ articleVO.setCreateBy(null);
}
});
+ voList.stream().filter(articleVO -> articleVO.getReported().equals(Boolean.TRUE))
+ .peek(articleVO -> {
+ Member member = memberMap.get(Long.valueOf(articleVO.getReportBy()));
+ if (StringUtils.isNotNull(member)) {
+ articleVO.setReportBy(member.getNickname());
+ }
+ }).collect(Collectors.toList());
}
return pageVO;
}
+
+ /**
+ * "添加/编辑资讯
+ *
+ * @param dto 管理后台-资讯传输对象
+ */
+ @Override
+ public void saveArticle(MgtArticleDTO dto) {
+ 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());
+ if (StringUtils.isNull(articleById)) {
+ throw new ServiceException("资讯不存在");
+ }
+ this.updateById(article);
+ }
+ }
+
+ /**
+ * 处理举报
+ *
+ * @param id 资讯id
+ */
+ @Override
+ public void handleReport(Long id) {
+ Article article = this.getById(id);
+ if (StringUtils.isNull(article)) {
+ throw new ServiceException("资讯不存在");
+ }
+ if (Boolean.FALSE.equals(article.getReported())) {
+ throw new ServiceException("该资讯未举报");
+ }
+ article.setReported(Boolean.FALSE);
+ this.updateById(article);
+ }
+
+ /**
+ * 查看详情
+ *
+ * @param id 资讯id
+ * @return MgtArticleVO
+ */
+ @Override
+ public MgtArticleVO getDetail(Long id) {
+ Article article = this.getById(id);
+ if (StringUtils.isNull(article)) {
+ throw new ServiceException("资讯不存在");
+ }
+ MgtArticleVO mgtArticleVO = BeanUtils.copyBean(article, MgtArticleVO.class);
+ long count = articleCommentsService.count(
+ Wrappers.lambdaQuery(ArticleComments.class).eq(ArticleComments::getArticleId, id)
+ .eq(ArticleComments::getType, 1));
+ mgtArticleVO.setCommentCount((int) count);
+ return mgtArticleVO;
+ }
+
+ /**
+ * 资讯审核
+ *
+ * @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();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void removeCommentsById(Long id) {
+ ArticleComments articleComments = articleCommentsService.getById(id);
+ if (StringUtils.isNull(articleComments)) {
+ throw new ServiceException("评论/回复不存在");
+ }
+ articleCommentsService.removeById(id);
+ // 评论
+ if (articleComments.getType().equals(1)) {
+ // 查询回复
+ List<ArticleComments> replyList = articleCommentsService.lambdaQuery()
+ .eq(ArticleComments::getReplyId, id).list();
+ if (StringUtils.isNotEmpty(replyList)) {
+ List<Long> replyIds = replyList.stream().map(ArticleComments::getId)
+ .collect(Collectors.toList());
+ articleCommentsService.removeByIds(replyIds);
+ }
+ }
+ }
}
--
Gitblit v1.7.1