This commit is contained in:
77
2024-03-18 00:07:03 +08:00
parent bd4ad464a5
commit 688ef1d649
25 changed files with 465 additions and 21 deletions

View File

@@ -2,6 +2,7 @@ package com.ruoyi.xq.controller.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.PageModel;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
@@ -38,8 +39,8 @@ public class DynamicAppController {
@GetMapping("/page")
@Operation(summary = "动态列表-分页")
@Log(title = "动态列表-分页", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery dynamicQuery){
public R<PageModel<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery dynamicQuery){
Page<DynamicListVo> page = dynamicService.pageApp(pageQuery, dynamicQuery);
return R.ok(page.getRecords());
return R.ok(PageModel.build(page));
}
}

View File

@@ -2,19 +2,21 @@ package com.ruoyi.xq.controller.app;
import cn.dev33.satoken.annotation.SaIgnore;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.PageModel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.Banner;
import com.ruoyi.xq.dto.app.user.HomePageReq;
import com.ruoyi.xq.dto.app.user.vo.HomeUserListVo;
import com.ruoyi.xq.dto.app.user.vo.HomeUserVo;
import com.ruoyi.xq.service.BannerService;
import com.ruoyi.xq.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -25,17 +27,28 @@ import java.util.List;
public class HomeAppController {
@Autowired
private UserService userService;
@Autowired
private BannerService bannerService;
@PostMapping("/user/page")
@Operation(summary = "首页查询用户-分页")
@Log(title = "首页查询用户-分页", businessType = BusinessType.OTHER, isSaveDb = false)
public R<PageModel<HomeUserListVo>> userPage(@RequestBody HomePageReq homePageReq){
Page<HomeUserListVo> vo = userService.homePage(homePageReq);
return R.ok(PageModel.build(vo));
}
@GetMapping("/user/info")
@Operation(summary = "查询用户主页信息")
@Log(title = "查询用户主页信息", businessType = BusinessType.OTHER, isSaveDb = false)
public R<HomeUserVo> homeUser(Long userId){
public R<HomeUserVo> userInfo(Long userId){
HomeUserVo vo = userService.homeUser(userId);
return R.ok(vo);
}
@Autowired
private BannerService bannerService;
@GetMapping("/banner")
@Operation(summary = "轮播图")
@Log(title = "轮播图", businessType = BusinessType.OTHER, isSaveDb = false)

View File

@@ -0,0 +1,44 @@
package com.ruoyi.xq.controller.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.PageModel;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.xq.dto.app.userstar.UserStarQuery;
import com.ruoyi.xq.dto.app.userstar.UserStarReq;
import com.ruoyi.xq.dto.app.userstar.vo.UserStarListVo;
import com.ruoyi.xq.service.UserStarService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api/star")
@Tag(name = "用户关注接口")
public class UserStarAppController {
@Autowired
private UserStarService userStarService;
@PostMapping("/update")
@Operation(summary = "用户关注和取消关注")
@Log(title = "用户关注和取消关注", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Void> starUpdate(@RequestBody UserStarReq req){
req.setUserId(LoginHelper.getUserId());
userStarService.starUpdate(req);
return R.ok();
}
@GetMapping("/page")
@Operation(summary = "关注查询-分页")
@Log(title = "关注查询-分页", businessType = BusinessType.OTHER, isSaveDb = false)
public R<PageModel<UserStarListVo>> page(PageQuery pageQuery, UserStarQuery query){
query.setUserId(LoginHelper.getUserId());
Page<UserStarListVo> app = userStarService.pageApp(pageQuery, query);
return R.ok(PageModel.build(app));
}
}

View File

@@ -4,6 +4,7 @@ package com.ruoyi.xq.controller.app;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.PageModel;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
@@ -56,10 +57,10 @@ public class WithdrawAppController {
@GetMapping("/logs/page")
@Operation(summary = "提现记录")
@Log(title = "申请记录", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<WithdrawListAppVo>> logsPage(PageQuery pageQuery, WithdrawListPageQuery query){
public R<PageModel<WithdrawListAppVo>> logsPage(PageQuery pageQuery, WithdrawListPageQuery query){
query.setUserId(LoginHelper.getUserId());
Page<WithdrawListAppVo> result = userWithdrawService.pageApp(pageQuery,query);
return R.ok(result.getRecords());
return R.ok(PageModel.build(result));
}