init

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java

@@ -7,15 +7,14 @@ import com.ruoyi.cai.dto.app.query.index.GreetQuery;
 import com.ruoyi.cai.dto.app.query.index.UserQuery;
 import com.ruoyi.cai.dto.app.vo.AnchorListVo;
 import com.ruoyi.cai.dto.app.vo.IndexBannerVo;
-import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
-import com.ruoyi.cai.dto.app.vo.user.UserListVo;
 import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo;
 import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo;
+import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
+import com.ruoyi.cai.dto.app.vo.user.UserListVo;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.BeanConvertUtil;
 import io.swagger.v3.oas.annotations.Operation;
@@ -55,25 +54,25 @@ public class IndexController {
     @GetMapping("/anchor/page")
     @Operation(summary = "首页查询主播接口-分页")
     @Log(title = "首页查询主播接口", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<AnchorListVo> page(PageQuery page, AnchorListQuery query){
+    public R<List<AnchorListVo>> page(PageQuery page, AnchorListQuery query){
         Page<AnchorListVo> res = anchorService.pageApp(page,query);
-        return TableDataInfo.build(res);
+        return R.ok(res.getRecords());
     }
 
     @GetMapping("/user/page")
     @Operation(summary = "首页用户搜索接口-分页")
     @Log(title = "首页用户搜索接口-分页", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<UserListVo> page(PageQuery page, UserQuery query){
+    public R<List<UserListVo>> page(PageQuery page, UserQuery query){
         Page<UserListVo> res = userService.pageApp(page,query);
-        return TableDataInfo.build(res);
+        return R.ok(res.getRecords());
     }
 
     @GetMapping("/user/greet/page")
     @Operation(summary = "群打招呼界面-用户搜索接口")
     @Log(title = "群打招呼界面-用户搜索接口", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<UserListVo> greetQuery(PageQuery page, GreetQuery query){
+    public R<List<UserListVo>> greetQuery(PageQuery page, GreetQuery query){
         Page<UserListVo> res = userService.greetPageApp(page,query);
-        return TableDataInfo.build(res);
+        return R.ok(res.getRecords());
     }
 
     @GetMapping("/home/info")
@@ -88,9 +87,9 @@ public class IndexController {
     @GetMapping("/userGuard/page")
     @Operation(summary = "获取指定女神守护排行")
     @Log(title = "获取指定女神守护排行", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<GuardListPageVo> userGuardPage(PageQuery pageQuery,Long userId){
+    public R<List<GuardListPageVo>> userGuardPage(PageQuery pageQuery,Long userId){
         Page<GuardListPageVo> page = guardTotalService.userGuardPage(pageQuery, userId);
-        return TableDataInfo.build(page);
+        return R.ok(page.getRecords());
     }
 
     @GetMapping("/userGift/list")

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/invite")
 @Tag(name = "邀请相关接口")
@@ -37,10 +39,10 @@ public class InviteAppController {
     @GetMapping("/user/page")
     @Operation(summary = "我邀请的人")
     @Log(title = "我邀请的人", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<UserListVo> inviteUserPage(PageQuery pageQuery){
+    public R<List<UserListVo>> inviteUserPage(PageQuery pageQuery){
         Long userId = LoginHelper.getUserId();
         Page<UserListVo> userPage = userInviteService.inviteUserPage(pageQuery,userId);
-        return TableDataInfo.build(userPage);
+        return R.ok(userPage.getRecords());
     }
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java

@@ -15,6 +15,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/user/black")
 @Tag(name = "用户黑名单接口")
@@ -26,9 +28,9 @@ public class UserBlackAppController {
     @GetMapping("page")
     @Operation(summary = "用户黑名单查询")
     @Log(title = "用户黑名单查询", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<UserListVo> page(PageQuery pageQuery){
+    public R<List<UserListVo>> page(PageQuery pageQuery){
         Page<UserListVo> page = userBlacklistService.pageApp(pageQuery, LoginHelper.getUserId());
-        return TableDataInfo.build(page);
+        return R.ok(page.getRecords());
     }
 
     @PostMapping("black")

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java

@@ -10,7 +10,6 @@ import com.ruoyi.cai.service.UserFollowDynamicService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.helper.LoginHelper;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,6 +17,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/dynamic")
 @Tag(name = "广场动态相关接口")
@@ -31,9 +32,9 @@ public class UserDynamicAppController {
     @GetMapping("/page")
     @Operation(summary = "动态查询动态")
     @Log(title = "动态查询动态", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<DynamicListVo> page(PageQuery pageQuery, DynamicQuery query){
+    public R<List<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery query){
         Page<DynamicListVo> resp =  dynamicService.pageApp(pageQuery,query);
-        return TableDataInfo.build(resp);
+        return R.ok(resp.getRecords());
     }
 
     @PostMapping("/star")

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java

@@ -15,6 +15,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/user/star")
 @Tag(name = "关注相关接口")
@@ -42,9 +44,9 @@ public class UserStartAppController {
     @GetMapping("/page")
     @Operation(summary = "关注、粉丝列表查询")
     @Log(title = "粉丝列表查询", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<UserStarOrVisitorList> page(StarQuery query, PageQuery pageQuery){
+    public R<List<UserStarOrVisitorList>> page(StarQuery query, PageQuery pageQuery){
         Page<UserStarOrVisitorList> res = userFollowService.pageApp(pageQuery,query);
-        return TableDataInfo.build(res);
+        return R.ok(res.getRecords());
     }
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java

@@ -16,6 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/user/visitor")
 @Slf4j
@@ -41,9 +43,9 @@ public class UserVisitorAppController {
     @GetMapping("/page")
     @Operation(summary = "我的浏览记录、访客查询-分页")
     @Log(title = "我的浏览记录、访客查询-分页", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<UserStarOrVisitorList> page(VisitorQuery query, PageQuery pageQuery){
+    public R<List<UserStarOrVisitorList>> page(VisitorQuery query, PageQuery pageQuery){
         Page<UserStarOrVisitorList> res = userVisitorService.pageApp(pageQuery,query);
-        return TableDataInfo.build(res);
+        return R.ok(res.getRecords());
     }
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java

@@ -20,11 +20,14 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.utils.BeanConvertUtil;
 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.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/wallet")
 @Tag(name = "钱包操作相关的接口")
@@ -72,25 +75,25 @@ public class WalletController {
     @GetMapping("/recharge/log")
     @Operation(summary = "充值记录-分页")
     @Log(title = "充值记录", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<RechargeOrderVo> rechargeLog(PageQuery query){
+    public R<List<RechargeOrderVo>> rechargeLog(PageQuery query){
         Long userId = LoginHelper.getUserId();
         Page<RechargeOrder> page = rechargeOrderService.page(query.build(), Wrappers.lambdaQuery(RechargeOrder.class)
                 .eq(RechargeOrder::getUserId, userId)
                 .eq(RechargeOrder::getAdmin,false)
                 .eq(RechargeOrder::getPayStatus, PayStatusEnum.PAY.getCode())
                 .orderByDesc(RechargeOrder::getCreateTime));
-        return TableDataInfo.build(page, RechargeOrderVo::new);
+        return R.ok(BeanConvertUtil.convertListTo(page.getRecords(),RechargeOrderVo::new));
     }
 
     @GetMapping("/cash/log")
     @Operation(summary = "提现记录-分页")
     @Log(title = "提现记录", businessType = BusinessType.OTHER, isSaveDb = false)
-    public TableDataInfo<AccountCashVo> cashLog(PageQuery query){
+    public R<List<AccountCashVo>> cashLog(PageQuery query){
         Long userId = LoginHelper.getUserId();
         Page<AccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(AccountCash.class)
                 .eq(AccountCash::getUserId, userId)
                 .orderByDesc(AccountCash::getCreateTime));
-        return TableDataInfo.build(page,AccountCashVo::new);
+        return R.ok(BeanConvertUtil.convertListTo(page.getRecords(),AccountCashVo::new));
     }
 
 }