From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:48:43 +0800
Subject: [PATCH] Merge branch 'mitao-dev'

---
 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)

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 f5dfd23..4f96fb7 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
@@ -3,20 +3,21 @@
 
 import com.ruoyi.article.domain.Article;
 import com.ruoyi.article.dto.ArticleDTO;
+import com.ruoyi.article.dto.MemberLikeDTO;
 import com.ruoyi.article.service.IArticleService;
 import com.ruoyi.article.vo.ArticleCommentsVO;
+import com.ruoyi.article.vo.ArticleVO;
 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.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.formula.functions.T;
 import javax.annotation.Resource;
-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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -35,36 +36,37 @@
  */
 @RestController
 @RequestMapping("/article")
+@Api(value = "用户端-资讯相关接口", tags = "用户端-资讯相关接口", description = "用户端-资讯相关接口")
 public class ArticleController {
     @Resource
     private IArticleService iArticleService;
 
     @PostMapping("/getArticleList")
     @ResponseBody
-    @ApiOperation(value = "获取资讯")
-    public R<PageDTO<Article>> getArticleList(ArticleDTO articleDTO) {
-      return R.ok(iArticleService.getArticleList(articleDTO));
+    @ApiOperation(value = "用户端-获取资讯")
+    public R<PageDTO<ArticleVO>> getArticleList( @RequestBody ArticleDTO articleDTO) {
+        return R.ok(iArticleService.getArticleList(articleDTO));
     }
 
     @PostMapping("/getMemberArticleList")
     @ResponseBody
-    @ApiOperation(value = "获取用户资讯")
-    public R<PageDTO<Article>> getMemberArticleList(ArticleDTO articleDTO) {
+    @ApiOperation(value = "用户端-获取用户资讯")
+    public R<PageDTO<Article>> getMemberArticleList(@RequestBody ArticleDTO articleDTO) {
         return R.ok(iArticleService.getMemberArticleList(articleDTO));
     }
 
     @PostMapping("/saveMemberArticle")
     @ResponseBody
-    @ApiOperation(value = "添加或者修改用户资讯")
-    public R<T> saveMemberArticle(ArticleDTO articleDTO) {
+    @ApiOperation(value = "用户端-添加或者修改用户资讯")
+    public R<T> saveMemberArticle(@RequestBody ArticleDTO articleDTO) {
         iArticleService.saveMemberArticle(articleDTO);
         return R.ok();
     }
 
     @PostMapping("/delMemberArticle")
     @ResponseBody
-    @ApiOperation(value = "删除用户资讯")
-    public R<T> delMemberArticle(ArticleDTO articleDTO) {
+    @ApiOperation(value = "用户端-删除用户资讯")
+    public R<T> delMemberArticle(@RequestBody ArticleDTO articleDTO) {
         iArticleService.delMemberArticle(articleDTO);
         return R.ok();
     }
@@ -72,26 +74,25 @@
 
     @PostMapping("/getMemberArticleInfo")
     @ResponseBody
-    @ApiOperation(value = "获取资讯详情")
-    public R<Article> getMemberArticleInfo(ArticleDTO articleDTO) {
+    @ApiOperation(value = "用户端-获取资讯详情")
+    public R<ArticleVO> getMemberArticleInfo(ArticleDTO articleDTO) {
         return R.ok(iArticleService.getMemberArticleInfo(articleDTO));
     }
 
 
-
-
     @PostMapping("/getArticleCommentsList")
     @ResponseBody
-    @ApiOperation(value = "获取评论列表")
+    @ApiOperation(value = "用户端-获取评论列表")
     public R<PageDTO<ArticleCommentsVO>> getArticleCommentsList(ArticleDTO articleDTO) {
         return R.ok(iArticleService.getArticleCommentsList(articleDTO));
     }
 
     @PostMapping("/getreport")
     @ResponseBody
-    @ApiOperation(value = "用户举报举报文章")
+    @ApiOperation(value = "用户端-用户举报举报文章")
     public R<T> getReport(ArticleDTO articleDTO) {
         iArticleService.getReport(articleDTO);
         return R.ok();
     }
+
 }

--
Gitblit v1.7.1