rentaiming
2024-05-27 b98f7d2c9401c3b60d776794e3473ca5c4723b54
写用户端接口
8个文件已修改
125 ■■■■■ 已修改文件
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/Article.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/ISensitiveWordsService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/SensitiveWordsServiceImpl.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
@@ -1,6 +1,7 @@
package com.ruoyi.article.controller;
import com.ruoyi.article.domain.pojo.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.common.core.domain.R;
@@ -31,8 +32,14 @@
    @PostMapping("/getArticleList")
    @ResponseBody
    @ApiOperation(value = "获取资讯")
    public R<PageDTO<MemberAddress>> getArticleList(ArticleDTO articleDTO) {
       /* return R.ok(iArticleService.getMemberAddressList(articleDTO));*/
        return null;
    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));
    }
}
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java
@@ -1,9 +1,21 @@
package com.ruoyi.article.controller;
import com.ruoyi.article.domain.pojo.Article;
import com.ruoyi.article.domain.pojo.SensitiveWords;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.service.ISensitiveWordsService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.ApiOperation;
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 java.util.List;
/**
 * <p>
@@ -17,4 +29,14 @@
@RequestMapping("/sensitive-words")
public class SensitiveWordsController {
    @Resource
    private ISensitiveWordsService SensitiveWordsService;
    @PostMapping("/getSensitiveWordsList")
    @ResponseBody
    @ApiOperation(value = "获取敏感词")
    public R<List<SensitiveWords>> getMemberArticleList() {
        return R.ok(SensitiveWordsService.getMemberArticleList());
    }
}
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/Article.java
@@ -84,5 +84,16 @@
    @TableLogic
    private Integer delFlag;
    @ApiModelProperty(value = "收藏数")
    private Integer collectCount;
    @ApiModelProperty(value = "评论数")
    private Integer commentCount;
    @ApiModelProperty(value = "会员id")
    private Long memberId;
    @ApiModelProperty(value = "拒绝原因")
    private String refuseComment;
}
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
@@ -3,16 +3,17 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ArticleDTO {
public class ArticleDTO extends BasePage {
    @ApiModelProperty(value = "资讯id")
    private Long id;
    @ApiModelProperty(value = "资讯类型 1=平台发布 2=用户发布")
    private ArticleTypeEnum articleType;
    @ApiModelProperty(value = "资讯类型 0=全部,1=平台发布 2=用户发布")
    private Integer articleType;
    @ApiModelProperty(value = "资讯标题")
    private String title;
@@ -25,4 +26,7 @@
    @ApiModelProperty(value = "资讯视频")
    private String videoUrl;
    @ApiModelProperty(value = "会员id")
    private Long memberId;
}
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.domain.pojo.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.MemberAddress;
/**
 * <p>
 * 资讯表 服务类
@@ -12,4 +16,8 @@
 */
public interface IArticleService extends IService<Article> {
    PageDTO< Article> getArticleList(ArticleDTO articleDTO);
    PageDTO<Article> getMemberArticleList(ArticleDTO articleDTO);
}
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/ISensitiveWordsService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.domain.pojo.SensitiveWords;
import java.util.List;
/**
 * <p>
 * 敏感词管理 服务类
@@ -12,5 +14,6 @@
 * @since 2024-05-16
 */
public interface ISensitiveWordsService extends IService<SensitiveWords> {
    List<SensitiveWords> getMemberArticleList();
}
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -1,10 +1,18 @@
package com.ruoyi.article.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.pojo.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.MemberAddress;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * <p>
@@ -15,7 +23,34 @@
 * @since 2024-05-16
 */
@Service
public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements
        IArticleService {
public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements IArticleService {
    @Resource
    private IArticleService articleService;
    @Override
    public PageDTO<Article> getArticleList(ArticleDTO articleDTO) {
        Page<Article> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
        LambdaQueryWrapper< Article> wrapper= Wrappers.lambdaQuery();
        if (articleDTO.getArticleType()!=0){
            wrapper.like(Article::getArticleType,articleDTO.getArticleType());
        }
        wrapper.like(Article::getTitle,articleDTO.getTitle());
        wrapper.eq(Article::getStatus,2);
        wrapper.eq( Article::getDelFlag,0);
        wrapper.orderByDesc(Article::getCreateTime);
        Page< Article> page1 = articleService.page(page, wrapper);
        return PageDTO.of(page1);
    }
    @Override
    public PageDTO<Article> getMemberArticleList(ArticleDTO articleDTO) {
        Page<Article> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
        LambdaQueryWrapper< Article> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Article::getMemberId,articleDTO.getMemberId());
        wrapper.eq( Article::getDelFlag,0);
        wrapper.orderByDesc(Article::getCreateTime);
        Page< Article> page1 = articleService.page(page, wrapper);
        return PageDTO.of(page1);
    }
}
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/SensitiveWordsServiceImpl.java
@@ -1,10 +1,18 @@
package com.ruoyi.article.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.pojo.Article;
import com.ruoyi.article.domain.pojo.SensitiveWords;
import com.ruoyi.article.mapper.SensitiveWordsMapper;
import com.ruoyi.article.service.ISensitiveWordsService;
import com.ruoyi.common.core.utils.page.PageDTO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
 * <p>
@@ -15,7 +23,14 @@
 * @since 2024-05-16
 */
@Service
public class SensitiveWordsServiceImpl extends
        ServiceImpl<SensitiveWordsMapper, SensitiveWords> implements ISensitiveWordsService {
public class SensitiveWordsServiceImpl extends ServiceImpl<SensitiveWordsMapper, SensitiveWords> implements ISensitiveWordsService {
    @Resource
    private ISensitiveWordsService sensitiveWordsService;
    @Override
    public List<SensitiveWords> getMemberArticleList() {
        LambdaQueryWrapper<SensitiveWords> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(SensitiveWords::getDelFlag,0);
        return sensitiveWordsService.list(wrapper);
    }
}