init

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.metadata.IPage;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiConsumeLogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

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

@@ -8,9 +8,9 @@ import com.ruoyi.cai.dto.app.vo.AnchorListVo;
 import com.ruoyi.cai.dto.app.vo.IndexBannerVo;
 import com.ruoyi.cai.dto.app.vo.UserInfoVo;
 import com.ruoyi.cai.dto.app.vo.UserListVo;
-import com.ruoyi.cai.service.CaiAnchorService;
-import com.ruoyi.cai.service.CaiBannerService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo;
+import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo;
+import com.ruoyi.cai.service.*;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -36,6 +36,10 @@ public class CaiIndexController {
     private CaiUserService caiUserService;
     @Autowired
     private CaiBannerService bannerService;
+    @Autowired
+    private CaiGuardTotalService guardTotalService;
+    @Autowired
+    private CaiUserGiftService userGiftService;
 
     @GetMapping("/banner")
     @Operation(summary = "获取首页banner图")
@@ -59,9 +63,24 @@ public class CaiIndexController {
     }
 
     @GetMapping("/home/info")
-    @Operation(summary = "主页展示详情页")
+    @Operation(summary = "获取指定用户主页信息")
     public R<UserInfoVo> info(Long userId){
         UserInfoVo res = caiUserService.info(userId);
         return R.ok(res);
     }
+
+
+    @GetMapping("/userGuard/page")
+    @Operation(summary = "获取指定女神守护排行")
+    public TableDataInfo<GuardListPageVo> userGuardPage(PageQuery pageQuery,Long userId){
+        Page<GuardListPageVo> page = guardTotalService.userGuardPage(pageQuery, userId);
+        return TableDataInfo.build(page);
+    }
+
+    @GetMapping("/userGift/list")
+    @Operation(summary = "获取指定女神收到的礼物列表")
+    public R<List<UserGiftIndexVo>> userGiftList(Long userId){
+        List<UserGiftIndexVo> res = userGiftService.selectGiftList(userId);
+        return R.ok(res);
+    }
 }

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

@@ -27,7 +27,7 @@ public class CaiUserDynamicAppController {
     private CaiUserFollowDynamicService userFollowDynamicService;
 
     @GetMapping("/page")
-    @Operation(summary = "动态查询")
+    @Operation(summary = "动态查询动态")
     public TableDataInfo<DynamicListVo> page(PageQuery pageQuery, DynamicQuery query){
         Page<DynamicListVo> resp =  dynamicService.pageApp(pageQuery,query);
         return TableDataInfo.build(resp);