From 23e78efefd96d28f0c492348f3cb8a9e6cdcbbab Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 12:31:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java |   74 ++++++++++++++++++++++++++++++++----
 1 files changed, 65 insertions(+), 9 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 81253ad..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,15 +3,28 @@
 
 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;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
 
 /**
  * <p>
@@ -23,20 +36,63 @@
  */
 @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(@RequestBody ArticleDTO articleDTO) {
+        iArticleService.saveMemberArticle(articleDTO);
+        return R.ok();
+    }
+
+    @PostMapping("/delMemberArticle")
+    @ResponseBody
+    @ApiOperation(value = "用户端-删除用户资讯")
+    public R<T> delMemberArticle(@RequestBody ArticleDTO articleDTO) {
+        iArticleService.delMemberArticle(articleDTO);
+        return R.ok();
+    }
+
+
+    @PostMapping("/getMemberArticleInfo")
+    @ResponseBody
+    @ApiOperation(value = "用户端-获取资讯详情")
+    public R<ArticleVO> 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();
+    }
+
 }

--
Gitblit v1.7.1