Merge branch 'dev-mitao'

mitao

2024-05-27 95163bc7f6714edcb14dd4369717b0a9d1ae15da

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java

@@ -1,10 +1,12 @@
package com.ruoyi.article.controller;


import com.ruoyi.article.domain.pojo.Article;
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;
@@ -12,9 +14,9 @@
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;

@@ -42,8 +44,8 @@
    @PostMapping("/getArticleList")
    @ResponseBody
    @ApiOperation(value = "获取资讯")
    public R<PageDTO<Article>> getArticleList(ArticleDTO articleDTO) {
      return R.ok(iArticleService.getArticleList(articleDTO));
    public R<PageDTO<ArticleVO>> getArticleList(ArticleDTO articleDTO) {
        return R.ok(iArticleService.getArticleList(articleDTO));
    }

    @PostMapping("/getMemberArticleList")
@@ -73,11 +75,9 @@
    @PostMapping("/getMemberArticleInfo")
    @ResponseBody
    @ApiOperation(value = "获取资讯详情")
    public R<Article> getMemberArticleInfo(ArticleDTO articleDTO) {
    public R<ArticleVO> getMemberArticleInfo(ArticleDTO articleDTO) {
        return R.ok(iArticleService.getMemberArticleInfo(articleDTO));
    }




    @PostMapping("/getArticleCommentsList")
@@ -94,4 +94,5 @@
        iArticleService.getReport(articleDTO);
        return R.ok();
    }

}