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/MemberArticleCollectionController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
index 02aa1c2..febb4d2 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
@@ -1,9 +1,21 @@
package com.ruoyi.article.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.article.domain.Article;
+import com.ruoyi.article.dto.ArticleDTO;
+import com.ruoyi.article.dto.MemberArticleCollectionDTO;
+import com.ruoyi.article.dto.MemberLikeDTO;
+import com.ruoyi.article.service.IMemberArticleCollectionService;
+import com.ruoyi.article.vo.ArticleVO;
+import com.ruoyi.article.vo.MemberArticleCollectionVO;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
/**
* <p>
@@ -15,6 +27,26 @@
*/
@RestController
@RequestMapping("/member-article-collection")
+@Api(value = "用户端-资讯文章收藏相关接口", tags = "用户端-资讯文章收藏相关接口", description = "用户端-资讯文章收藏相关接口")
public class MemberArticleCollectionController {
+ @Resource
+ private IMemberArticleCollectionService memberArticleCollectionService;
+
+ @PostMapping("/saveMemberArticleCollection")
+ @ResponseBody
+ @ApiOperation(value = "用户端-文章收藏和取消收藏")
+ public R<T> saveMemberArticleCollection( @RequestBody MemberArticleCollectionDTO memberArticleCollectionDTO) {
+ memberArticleCollectionService.saveMemberArticleCollection(memberArticleCollectionDTO);
+ return R.ok();
+ }
+
+
+ @PostMapping("/getMemberArticleCollection")
+ @ResponseBody
+ @ApiOperation(value = "用户端-获取用户收藏资讯")
+ public R<PageDTO<MemberArticleCollectionVO>> getMemberArticleCollection( ArticleDTO articleDTO) {
+ return R.ok(memberArticleCollectionService.getMemberArticleCollection(articleDTO));
+ }
+
}
--
Gitblit v1.7.1