Merge remote-tracking branch 'origin/master'

mitao

2024-06-11 9cdb4d78e0a21d3803bb46b3a49099fabff727b1

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java

@@ -1,15 +1,14 @@
package com.ruoyi.article.controller.forepart;


import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.vo.MemberArticleCollectionVO;
import com.ruoyi.article.controller.forepart.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 javax.annotation.Resource;
@@ -31,18 +30,16 @@
    private IMemberArticleCollectionService memberArticleCollectionService;

    @PostMapping("/saveMemberArticleCollection")
    @ResponseBody
    @ApiOperation(value = "用户端-文章收藏和取消收藏")
    public R<T> saveMemberArticleCollection( @RequestBody MemberArticleCollectionDTO memberArticleCollectionDTO) {
    public R saveMemberArticleCollection( @RequestBody MemberArticleCollectionDTO memberArticleCollectionDTO) {
        memberArticleCollectionService.saveMemberArticleCollection(memberArticleCollectionDTO);
        return R.ok();
    }


    @PostMapping("/getMemberArticleCollection")
    @ResponseBody
    @ApiOperation(value = "用户端-获取用户收藏资讯")
    public R<PageDTO<MemberArticleCollectionVO>> getMemberArticleCollection( ArticleDTO articleDTO) {
    public R<PageDTO<MemberArticleCollectionVO>> getMemberArticleCollection(@RequestBody ArticleDTO articleDTO) {
        return R.ok(memberArticleCollectionService.getMemberArticleCollection(articleDTO));
    }