From 05fe558f722590aa706c2296c8a9a619d12b42be Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 14:35:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 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 0c86ffd..f5dfd23 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
@@ -1,9 +1,29 @@
package com.ruoyi.article.controller;
+import com.ruoyi.article.domain.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 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 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>
@@ -16,5 +36,62 @@
@RestController
@RequestMapping("/article")
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));
+ }
+
+ @PostMapping("/getMemberArticleList")
+ @ResponseBody
+ @ApiOperation(value = "获取用户资讯")
+ 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();
+ }
}
--
Gitblit v1.7.1