Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppConfigController.java

@@ -1,20 +1,24 @@
package com.ruoyi.system.controller.miniapp;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.domain.dto.AppAgreementDto;
import com.ruoyi.system.domain.dto.AppUserAuthorizeDto;
import com.ruoyi.system.domain.vo.AppAgreementVo;
import com.ruoyi.system.domain.vo.AppUserAuthorizeVo;
import com.ruoyi.system.domain.dto.AppArticlePageDto;
import com.ruoyi.system.domain.vo.*;
import com.ruoyi.system.service.config.AgreementService;
import com.ruoyi.system.service.member.MemberService;
import com.ruoyi.system.service.config.ArticleService;
import com.ruoyi.system.service.config.SysClassificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * @author jqs34
@@ -28,20 +32,16 @@
@RequestMapping("/app/config")
public class AppConfigController {

    @Autowired
    private MemberService memberService;

    @Autowired
    @Resource
    private AgreementService agreementService;

    @RequestMapping(value = "/getAppUserAuthorize", method = RequestMethod.POST)
    @ApiOperation(value = "获取用户授权信息")
    public R<AppUserAuthorizeVo> getAppUserAuthorize(@RequestBody AppUserAuthorizeDto appUserAuthorizeDto) {
        Long userId = SecurityUtils.getUserId();
        appUserAuthorizeDto.setUserId(userId);
        AppUserAuthorizeVo appUserAuthorizeVo = memberService.getAppUserAuthorize(appUserAuthorizeDto);
        return R.ok(appUserAuthorizeVo);
    }
    @Resource
    private SysClassificationService sysClassificationService;

    @Resource
    private ArticleService articleService;


    @RequestMapping(value = "/getAppAgreement", method = RequestMethod.POST)
    @ApiOperation(value = "获取协议")
@@ -50,6 +50,29 @@
        return R.ok(appAgreementVo);
    }

    @RequestMapping(value = "/listArticleClass", method = RequestMethod.POST)
    @ApiOperation(value = "获取文章分类")
    public R<List<AppClassListVo>> listArticleClass(){
        List<AppClassListVo> classVoList = sysClassificationService.listByType(1);
        return R.ok(classVoList);
    }

    @RequestMapping(value = "/listArticleByClass", method = RequestMethod.POST)
    @ApiOperation(value = "通过分类获取文章列表")
    public R<Page<AppArticlePageVo>> listArticleByClass(@RequestBody AppArticlePageDto appArticlePageDto){
        Page<AppArticlePageVo> page = new Page<>();
        page.setSize(appArticlePageDto.getPageSize());
        page.setCurrent(appArticlePageDto.getPageNum());
        List<AppArticlePageVo> appClassListVoList = articleService.listArticleByClass(page, appArticlePageDto.getClassId());
        return R.ok(page.setRecords(appClassListVoList));
    }

    @RequestMapping(value = "/getArticle", method = RequestMethod.POST)
    @ApiOperation(value = "获取文章")
    public R<AppArticleGetVo> getArticle(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
        mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
        AppArticleGetVo appArticleGetVo = articleService.getAppArticle(Long.valueOf(mgtBaseGetDto.getId()));
        return R.ok(appArticleGetVo);
    }

}