From a71ee1cbe7611b95485d0e951ef0030f1f2b7826 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 14:32:28 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java | 4
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java | 52 +++++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberMapper.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 5
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 93 +++++++++++++
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java | 35 +++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java | 6
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java | 5
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java | 2
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java | 16 ++
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java | 33 ++++
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java | 50 +++++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 2
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/ArticleComments.java | 7 +
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java | 11 +
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java | 29 ++++
18 files changed, 351 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
similarity index 98%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
index cf89767..bd410d5 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
@@ -1,4 +1,4 @@
-package com.ruoyi.member.domain.pojo;
+package com.ruoyi.system.api.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
index fdc2e7c..dc7b7ba 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.feignClient.MemberClient;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -20,6 +21,11 @@
public R<MemberAddress> getMemberAddressOne(Long userId) {
return R.fail("通过用户地址失败:" + cause.getMessage());
}
+
+ @Override
+ public R<Member> getMembeOne(Long userId) {
+ return R.fail("获取用户失败:" + cause.getMessage());
+ }
};
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
index ef5c719..33fe3ab 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.factory.MemberFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
@@ -14,4 +15,7 @@
@PostMapping("/member-address/getMemberAddressOne")
R<MemberAddress> getMemberAddressOne(@RequestBody Long userId);
+ @PostMapping("/member/getMembeOne")
+ R<Member> getMembeOne(@RequestBody Long userId);
+
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
index a971196..34a7a85 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
@@ -1,9 +1,19 @@
package com.ruoyi.article.controller;
+import com.ruoyi.article.dto.ArticleCommentsDTO;
+import com.ruoyi.article.dto.ArticleDTO;
+import com.ruoyi.article.service.IArticleCommentsService;
+import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -17,4 +27,23 @@
@RequestMapping("/article-comments")
public class ArticleCommentsController {
+ @Resource
+ private IArticleCommentsService articleCommentsService;
+
+ @PostMapping("/saveMemberArticleComments")
+ @ResponseBody
+ @ApiOperation(value = "添加或者修改用户评论/回复")
+ public R<T> saveMemberArticleComments(ArticleCommentsDTO articleCommentsDTO) {
+ articleCommentsService.saveMemberArticleComments(articleCommentsDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/delMemberArticleComments")
+ @ResponseBody
+ @ApiOperation(value = "删除用户评论/回复")
+ public R<T> delMemberArticleComments(ArticleCommentsDTO articleCommentsDTO) {
+ articleCommentsService.delMemberArticleComments(articleCommentsDTO);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
index dfe27d8..660147e 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
@@ -4,10 +4,14 @@
import com.ruoyi.article.domain.pojo.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.service.IArticleService;
+import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.MemberAddress;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,6 +19,11 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
/**
* <p>
@@ -29,6 +38,7 @@
public class ArticleController {
@Resource
private IArticleService iArticleService;
+
@PostMapping("/getArticleList")
@ResponseBody
@ApiOperation(value = "获取资讯")
@@ -42,4 +52,46 @@
public R<PageDTO<Article>> getMemberArticleList(ArticleDTO articleDTO) {
return R.ok(iArticleService.getMemberArticleList(articleDTO));
}
+
+ @PostMapping("/saveMemberArticle")
+ @ResponseBody
+ @ApiOperation(value = "添加或者修改用户资讯")
+ public R<T> saveMemberArticle(ArticleDTO articleDTO) {
+ iArticleService.saveMemberArticle(articleDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/delMemberArticle")
+ @ResponseBody
+ @ApiOperation(value = "删除用户资讯")
+ public R<T> delMemberArticle(ArticleDTO articleDTO) {
+ iArticleService.delMemberArticle(articleDTO);
+ return R.ok();
+ }
+
+
+ @PostMapping("/getMemberArticleInfo")
+ @ResponseBody
+ @ApiOperation(value = "获取资讯详情")
+ public R<Article> getMemberArticleInfo(ArticleDTO articleDTO) {
+ return R.ok(iArticleService.getMemberArticleInfo(articleDTO));
+ }
+
+
+
+
+ @PostMapping("/getArticleCommentsList")
+ @ResponseBody
+ @ApiOperation(value = "获取评论列表")
+ public R<PageDTO<ArticleCommentsVO>> getArticleCommentsList(ArticleDTO articleDTO) {
+ return R.ok(iArticleService.getArticleCommentsList(articleDTO));
+ }
+
+ @PostMapping("/getreport")
+ @ResponseBody
+ @ApiOperation(value = "用户举报举报文章")
+ public R<T> getReport(ArticleDTO articleDTO) {
+ iArticleService.getReport(articleDTO);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/ArticleComments.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/ArticleComments.java
index 8a4ac30..c744096 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/ArticleComments.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/ArticleComments.java
@@ -68,4 +68,11 @@
private Integer delFlag;
+ @ApiModelProperty(value = "被评论会员id")
+ private Long bmemberId;
+
+ @ApiModelProperty(value = "1 评论，2 是回复")
+ private Integer type;
+
+
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java
new file mode 100644
index 0000000..314c084
--- /dev/null
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java
@@ -0,0 +1,33 @@
+package com.ruoyi.article.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+@Data
+public class ArticleCommentsDTO {
+
+ @ApiModelProperty(value = "资讯评论id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @ApiModelProperty(value = "资讯id")
+ private Long articleId;
+
+ @ApiModelProperty(value = "评论id")
+ private Long replyId;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "评论")
+ private String content;
+
+ @ApiModelProperty(value = "被评论会员id")
+ private Long bmemberId;
+
+ @ApiModelProperty(value = "1 评论，2 是回复")
+ private Integer type;
+
+}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
index 8564ca0..1a81797 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
@Data
public class ArticleDTO extends BasePage {
@@ -21,12 +22,12 @@
@ApiModelProperty(value = "资讯内容")
private String content;
- @ApiModelProperty(value = "资讯图片 ['a','b','c','d','e']")
- private String images;
-
@ApiModelProperty(value = "资讯视频")
private String videoUrl;
@ApiModelProperty(value = "会员id")
private Long memberId;
+
+ @ApiModelProperty(value = "资讯图片")
+ private MultipartFile[] rticleImageUrl;
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java
index fbfe96d..f94bad4 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.domain.pojo.ArticleComments;
+import com.ruoyi.article.dto.ArticleCommentsDTO;
/**
* <p>
@@ -13,4 +14,8 @@
*/
public interface IArticleCommentsService extends IService<ArticleComments> {
+ void saveMemberArticleComments(ArticleCommentsDTO articleCommentsDTO);
+
+ void delMemberArticleComments(ArticleCommentsDTO articleCommentsDTO);
+
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java
index 3d6147b..9624520 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.domain.pojo.Article;
import com.ruoyi.article.dto.ArticleDTO;
+import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.MemberAddress;
@@ -20,4 +21,14 @@
PageDTO<Article> getMemberArticleList(ArticleDTO articleDTO);
+ void saveMemberArticle(ArticleDTO articleDTO);
+
+ void delMemberArticle(ArticleDTO articleDTO);
+
+ Article getMemberArticleInfo(ArticleDTO articleDTO);
+
+ PageDTO<ArticleCommentsVO> getArticleCommentsList(ArticleDTO articleDTO);
+ void getReport(ArticleDTO articleDTO);
+
+
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
index d23e6fa..f241b86 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
@@ -2,9 +2,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.pojo.ArticleComments;
+import com.ruoyi.article.dto.ArticleCommentsDTO;
import com.ruoyi.article.mapper.ArticleCommentsMapper;
import com.ruoyi.article.service.IArticleCommentsService;
+import com.ruoyi.common.core.exception.ServiceException;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -17,5 +21,36 @@
@Service
public class ArticleCommentsServiceImpl extends
ServiceImpl<ArticleCommentsMapper, ArticleComments> implements IArticleCommentsService {
+ @Resource
+ private IArticleCommentsService articleCommentsService;
+ @Override
+ public void saveMemberArticleComments(ArticleCommentsDTO articleCommentsDTO) {
+ ArticleComments articleComments=new ArticleComments();
+ if (articleCommentsDTO.getId()!=null){
+ articleComments= articleCommentsService.getById(articleCommentsDTO.getId());
+ }
+ if (articleCommentsDTO.getMemberId()==null){
+ throw new ServiceException("用户id错误");
+ }
+ if (articleCommentsDTO.getType()==1){
+ articleComments.setMemberId(articleCommentsDTO.getMemberId());
+ articleComments.setArticleId(articleCommentsDTO.getArticleId());
+ articleComments.setContent(articleCommentsDTO.getContent());
+ articleComments.setType(1);
+ }else{
+ articleComments.setMemberId(articleCommentsDTO.getMemberId());
+ articleComments.setArticleId(articleCommentsDTO.getArticleId());
+ articleComments.setReplyId(articleCommentsDTO.getReplyId());
+ articleComments.setContent(articleCommentsDTO.getContent());
+ articleComments.setBmemberId(articleCommentsDTO.getBmemberId());
+ articleComments.setType(2);
+ }
+ articleCommentsService.saveOrUpdate(articleComments);
+ }
+
+ @Override
+ public void delMemberArticleComments(ArticleCommentsDTO articleCommentsDTO) {
+ articleCommentsService.removeById(articleCommentsDTO.getId());
+ }
}
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 722b536..55ac505 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
@@ -5,14 +5,28 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.pojo.Article;
+import com.ruoyi.article.domain.pojo.ArticleComments;
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.vo.ArticleCommentsVO;
+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.page.PageDTO;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
+import com.ruoyi.system.api.feignClient.MemberClient;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import util.HuaWeiOBSUtil;
import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -27,6 +41,12 @@
@Resource
private IArticleService articleService;
+
+ @Resource
+ private IArticleCommentsService articleCommentsService;
+
+ @Resource
+ private MemberClient emberClient;
@Override
public PageDTO<Article> getArticleList(ArticleDTO articleDTO) {
@@ -50,7 +70,78 @@
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 = articleService.page(page, wrapper);
return PageDTO.of(page1);
}
+
+ @Override
+ public void saveMemberArticle(ArticleDTO articleDTO) {
+ Article article=new Article();
+ if (articleDTO.getId()!=null){
+ article=articleService.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);
+
+ }
+
+ @Override
+ public void delMemberArticle(ArticleDTO articleDTO) {
+ articleService.removeById(articleDTO.getId());
+ }
+
+ @Override
+ public Article getMemberArticleInfo(ArticleDTO articleDTO) {
+ Article article=articleService.getById(articleDTO.getId());
+ return article;
+ }
+
+ @Override
+ public PageDTO<ArticleCommentsVO> getArticleCommentsList(ArticleDTO articleDTO) {
+ Page<ArticleComments> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
+ LambdaQueryWrapper< ArticleComments> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(ArticleComments::getArticleId,articleDTO.getId());
+ wrapper.eq( ArticleComments::getDelFlag,0);
+ wrapper.eq( ArticleComments::getType,1);
+ wrapper.orderByDesc(ArticleComments::getCreateTime);
+ Page<ArticleComments> page1 = articleCommentsService.page(page, wrapper);
+
+ List<ArticleComments> articleCommentsList=page1.getRecords();
+ List<ArticleCommentsVO> articleCommentsVOList=new ArrayList<>();
+ for(ArticleComments articleComments:articleCommentsList){
+ ArticleCommentsVO articleCommentsVO=new ArticleCommentsVO();
+
+ }
+
+
+
+
+ return null;
+ }
+
+ @Override
+ public void getReport(ArticleDTO articleDTO) {
+ Article article= articleService.getById(articleDTO.getId());
+ R<Member> membeOne = emberClient.getMembeOne(articleDTO.getMemberId());
+ Member data = membeOne.getData();
+ article.setReportBy(data.getNickname());
+ article.setReportedTime(LocalDateTime.now());
+ articleService.saveOrUpdate(article);
+ }
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java
new file mode 100644
index 0000000..4d070b5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java
@@ -0,0 +1,50 @@
+package com.ruoyi.article.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class ArticleCommentsVO {
+
+ @ApiModelProperty(value = "资讯评论id")
+ private Long id;
+
+ @ApiModelProperty(value = "资讯id")
+ private Long articleId;
+
+ @ApiModelProperty(value = "评论id")
+ private Long replyId;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "会员名称")
+ private String memberNickname;
+
+ @ApiModelProperty(value = "会员头像")
+ private String memberNickavatar;
+
+ @ApiModelProperty(value = "评论")
+ private String content;
+
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "被评论会员id")
+ private Long bmemberId;
+
+ @ApiModelProperty(value = "会员名称")
+ private String bmemberNickname;
+
+ @ApiModelProperty(value = "会员头像")
+ private String bmemberNickavatar;
+
+ @ApiModelProperty("点赞数")
+ private Integer likeNum;
+
+ List<ArticleCommentsVO> articleCommentsVOList;
+}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index 3b27cf9..ae47f33 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -18,6 +18,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
/**
* <p>
* 拍卖商品表 服务实现类
@@ -31,7 +33,8 @@
@RequiredArgsConstructor
public class AuctionGoodsServiceImpl extends ServiceImpl<AuctionGoodsMapper, AuctionGoods> implements IAuctionGoodsService {
- private final GoodsSkuClient goodsSkuClient;
+ @Resource
+ private GoodsSkuClient goodsSkuClient;
@Override
public PageDTO<AuctionGoodsVO> getAuctionGoodsPage(AuctionGoodsQuery query) {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
index 6ad15d4..4ce35b6 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
@@ -2,11 +2,13 @@
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.dto.MemberDTO;
-import com.ruoyi.member.domain.pojo.Member;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.member.service.IMemberService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -31,6 +33,18 @@
public class MemberController {
@Resource
private IMemberService iMemberService;
+
+
+
+ @RequestMapping("/getMembeOne")
+ @ResponseBody
+ @InnerAuth
+ @ApiOperation(value = "获取通过id用户信息")
+ public R<Member> getMembeOne(@RequestBody Long userId) {
+ return R.ok(iMemberService.getById(userId));
+ }
+
+
@RequestMapping("/loginThird")
@ResponseBody
@ApiOperation(value = "第三方登陸和註冊")
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberMapper.java
index eb7e538..a6cb503 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.member.mapper;
-import com.ruoyi.member.domain.pojo.Member;
+import com.ruoyi.system.api.domain.Member;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
index 56c4780..a1802e4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
@@ -1,7 +1,7 @@
package com.ruoyi.member.service;
import com.ruoyi.member.dto.MemberDTO;
-import com.ruoyi.member.domain.pojo.Member;
+import com.ruoyi.system.api.domain.Member;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index 4ae784e..cc602ea 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -9,7 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.member.dto.MemberDTO;
-import com.ruoyi.member.domain.pojo.Member;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
--
Gitblit v1.7.1