diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountBankcardController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountBankcardController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java index 5554f516..3072dfd4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountBankcardController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountBusinessController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountBusinessController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java index 2454c357..82034638 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountBusinessController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountCashController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountCashController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java index b3bf344c..2490938c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountCashController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountDetailController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountDetailController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java index 22fc3771..f7d44cd8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountDetailController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountRechargeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountRechargeController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java index 9fd24ddb..36bf87da 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAccountRechargeController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAnchorApplyController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAnchorApplyController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java index d4f655f0..23137473 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAnchorApplyController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAnchorController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAnchorController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java index 2cf661e1..20bf2960 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiAnchorController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiBannerController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiBannerController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java index 92871c4a..aa16cfb2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiBannerController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiConsumeLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiConsumeLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiConsumeLogController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiConsumeLogController.java index a87b7d32..fd31eaea 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiConsumeLogController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiDynamicController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiDynamicController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java index a168da43..7ca251b5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiDynamicController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGiftController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGiftController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java index 5c9334f7..9747051d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGiftController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGiveLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGiveLogController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java index 588993e2..db05b949 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGiveLogController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGoodsController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGoodsController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java index 61d3475e..ab895a2f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGoodsController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiLowHeightRiskController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiLowHeightRiskController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java index 53548e1b..5c58499b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiLowHeightRiskController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiReportCateController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiReportCateController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java index 4a8e0e68..ff8c4a78 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiReportCateController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiReportController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiReportController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java index df9b3075..7605a2b7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiReportController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java index 9b1776f5..5e1c5870 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionUserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionUserController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java index 9b3b2d70..6229b0c0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionUserController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserAlbumController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserAlbumController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java index edb4f1d7..a752fea9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserAlbumController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCallController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCallController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java index 9d9353b0..dc4cce28 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCallController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCameraAuditController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCameraAuditController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java index d8371cb5..358a0a20 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCameraAuditController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java index 99d49652..207a5c1f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCountController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCountController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java index 875cf344..933d20ef 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserCountController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserForbidController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserForbidController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java index 474c2bdc..e674ca96 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserForbidController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserInviteController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserInviteController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java index 6fa1ff10..1750099e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserInviteController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserMemberController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserMemberController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java index aa53d9c4..af6177c0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserMemberController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserRiskLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserRiskLogController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java index 446da408..51a7f5ee 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserRiskLogController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserVisitorController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserVisitorController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java index 847e3e84..122aff06 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserVisitorController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiWithdrawExchangeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiWithdrawExchangeController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java index 7d7cf8b8..f7f6b6c7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiWithdrawExchangeController.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiIndexController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiIndexController.java index 03a8f9fd..8963f173 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiIndexController.java +++ b/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 info(Long userId){ UserInfoVo res = caiUserService.info(userId); return R.ok(res); } + + + @GetMapping("/userGuard/page") + @Operation(summary = "获取指定女神守护排行") + public TableDataInfo userGuardPage(PageQuery pageQuery,Long userId){ + Page page = guardTotalService.userGuardPage(pageQuery, userId); + return TableDataInfo.build(page); + } + + @GetMapping("/userGift/list") + @Operation(summary = "获取指定女神收到的礼物列表") + public R> userGiftList(Long userId){ + List res = userGiftService.selectGiftList(userId); + return R.ok(res); + } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java index 4f3df066..995cbb08 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java +++ b/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 page(PageQuery pageQuery, DynamicQuery query){ Page resp = dynamicService.pageApp(pageQuery,query); return TableDataInfo.build(resp); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/GuardTotalVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/GuardTotalDTO.java similarity index 74% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/GuardTotalVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/GuardTotalDTO.java index e2522bd0..cfdd9299 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/GuardTotalVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/GuardTotalDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; @Data -public class GuardTotalVo implements Serializable { +public class GuardTotalDTO implements Serializable { /** * 被守护人的user_id(大咖) */ @@ -19,7 +19,9 @@ public class GuardTotalVo implements Serializable { private Long toUserId; @Schema(description = "用户头像") - private String userAvatar; + private String avatar; + @Schema(description = "用户昵称") + private String nickname; /** * 累计守护符个数 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicQuery.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicQuery.java index 4bac7308..03d2d7b4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicQuery.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicQuery.java @@ -11,7 +11,7 @@ public class DynamicQuery { @Schema(description = "类型 1=最新（默认） 2=关注 3=同城") private Integer type = 1; - @Schema(description = "用户ID") + @Schema(description = "用户ID，可过滤指定的女神") private Long userId; @Schema(description = "当前用户ID", accessMode = Schema.AccessMode.READ_ONLY) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserInfoVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserInfoVo.java index 968738ae..b9a1c2d4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserInfoVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserInfoVo.java @@ -1,5 +1,8 @@ package com.ruoyi.cai.dto.app.vo; +import com.ruoyi.cai.dto.app.vo.index.GuardIndexVo; +import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; +import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -40,24 +43,20 @@ public class UserInfoVo { @Schema(description = "是否关注") private Boolean star; - // TODO @Schema(description = "用户状态") - private String status; - - @Schema(description = "用户状态描述") - private String statusMsg; + private OnlineStatusVo onlineStatus; @Schema(description = "相册集合") private List albumList = Collections.emptyList(); @Schema(description = "守护列表") - private List guardTotalList = Collections.emptyList(); + private GuardIndexVo guardIndexVo; @Schema(description = "最近的动态图片") private List dynamicList = Collections.emptyList(); @Schema(description = "礼物列表") - private List giftList = Collections.emptyList(); + private List giftList = Collections.emptyList(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/GuardIndexVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/GuardIndexVo.java new file mode 100644 index 00000000..b999c2ef --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/GuardIndexVo.java @@ -0,0 +1,28 @@ +package com.ruoyi.cai.dto.app.vo.index; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Collections; +import java.util.List; + +@Data +@Schema(description = "守护详情数据") +public class GuardIndexVo { + @Schema(description = "守护价格") + private Long guardPrice = 0L; + @Schema(description = "已有的人员列表") + private List userList = Collections.emptyList(); + @Schema(description = "距离上一个守护人数") + private Long diffNum = 0L; + @Schema(description = "最多的守护人昵称") + private String nickname; + @Schema(description = "最多的守护人头像") + private String avatar; + @Schema(description = "最多的守护人ID") + private Long userId; + @Schema(description = "总共的守护数") + private Long guardSymbolTotal = 0L; + @Schema(description = "总共的人数") + private Long guardPersonTotal = 0L; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/GuardListPageVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/GuardListPageVo.java new file mode 100644 index 00000000..107cfe16 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/GuardListPageVo.java @@ -0,0 +1,21 @@ +package com.ruoyi.cai.dto.app.vo.index; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "主播守护列表") +public class GuardListPageVo { + @Schema(description = "守护人ID") + private Long userId; + @Schema(description = "守护人昵称") + private String nickname; + @Schema(description = "守护人头像") + private String avatar; + @Schema(description = "守护人蜜瓜号") + private String usercode; + @Schema(description = "守护人累计守护个数") + private Long guardNum; + @Schema(description = "守护人累计守护值") + private Long guardValue; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserGiftVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/UserGiftIndexVo.java similarity index 71% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserGiftVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/UserGiftIndexVo.java index 9b4f9ed6..0729c9a1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserGiftVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/UserGiftIndexVo.java @@ -1,18 +1,15 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.index; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -public class UserGiftVo { +public class UserGiftIndexVo { - /** - * 接受者 - */ + @Schema(description = "赠送着") + private Long fromUid; + @Schema(description = "接收着") private Long toUid; - /** - * 礼物ID - */ @Schema(description = "礼物ID") private Long giftId; @Schema(description = "礼物名称") @@ -21,9 +18,6 @@ public class UserGiftVo { private String img; @Schema(description = "礼物价格") private String price; - /** - * 礼物数量 - */ @Schema(description = "礼物数量") private Long count; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/OnlineStatusVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/OnlineStatusVo.java new file mode 100644 index 00000000..66035791 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/OnlineStatusVo.java @@ -0,0 +1,10 @@ +package com.ruoyi.cai.dto.app.vo.user; + +import lombok.Data; + +@Data +public class OnlineStatusVo { + private Integer status; + private Integer onlineStatus; + private String statusMsg; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java index 66a39de9..1cb306af 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java @@ -7,6 +7,8 @@ import com.ruoyi.cai.dto.app.query.DynamicQuery; import com.ruoyi.cai.dto.app.vo.DynamicListVo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 主播动态Mapper接口 * @@ -16,4 +18,6 @@ import org.apache.ibatis.annotations.Param; public interface CaiDynamicMapper extends BaseMapper { Page pageApp(@Param("build") Page build, @Param("query") DynamicQuery query); + + List selectDynamicImageList(@Param("userId") Long userId, @Param("limit") Integer limit); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardTotalMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardTotalMapper.java index 45bd5800..e7bc94a5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardTotalMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardTotalMapper.java @@ -1,8 +1,10 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiGuardTotal; -import com.ruoyi.cai.dto.app.vo.GuardTotalVo; +import com.ruoyi.cai.dto.app.dto.GuardTotalDTO; +import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,7 +17,12 @@ import java.util.List; */ public interface CaiGuardTotalMapper extends BaseMapper { - List selectGuardTotal(@Param("fromUserId") Long fromUserId, @Param("limit") Integer limit); + List selectGuardTotal(@Param("fromUserId") Long fromUserId, @Param("limit") Integer limit); void incs(@Param("fromUserId") Long fromUserId, @Param("toUserId") Long toUserId, @Param("guardNum") Long guardNum, @Param("guardValue") Long guardValue); + + Long guardCount(@Param("fromUserId") Long fromUserId); + Long guardPersonCount(@Param("fromUserId") Long fromUserId); + + Page userGuardPage(@Param("build") Page build, @Param("userId") Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserGiftMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserGiftMapper.java index d78fab5c..c8609b3a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserGiftMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserGiftMapper.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.cai.domain.CaiUserGift; -import com.ruoyi.cai.dto.app.vo.UserGiftVo; +import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; */ public interface CaiUserGiftMapper extends BaseMapper { - List selectGiftList(@Param("userId") Long userId); + List selectGiftList(@Param("userId") Long userId); long countGiftNum(@Param("fromUid") Long fromUid, @Param("toUid") Long toUid); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java index a8f7a791..665ce457 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface CaiDynamicService extends IService { - List selectDynamicList(Long userId, Integer limit); + List selectDynamicImageList(Long userId, Integer limit); Page pageApp(PageQuery pageQuery, DynamicQuery query); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiftService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiftService.java index b3ea3107..d5ed7a22 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiftService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiftService.java @@ -14,4 +14,5 @@ import java.util.List; public interface CaiGiftService extends IService { List all(); + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java index f15457d3..ffdc7154 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java @@ -1,12 +1,13 @@ package com.ruoyi.cai.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiGuardTotal; import com.ruoyi.cai.dto.app.dto.GuardNum; import com.ruoyi.cai.dto.app.query.GiveGuardReq; -import com.ruoyi.cai.dto.app.vo.GuardTotalVo; - -import java.util.List; +import com.ruoyi.cai.dto.app.vo.index.GuardIndexVo; +import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo; +import com.ruoyi.common.core.domain.PageQuery; /** * 守护用户累计Service接口 @@ -16,9 +17,11 @@ import java.util.List; */ public interface CaiGuardTotalService extends IService { - List selectGuardTotalLimit(Long fromUserId,Integer limit); + GuardIndexVo guardInfoVo(Long fromUserId,Long toUserId, Integer limit); boolean giveGuard(GiveGuardReq query); GuardNum getGuardNum(Long fromUserId, Long toUserId); + + Page userGuardPage(PageQuery pageQuery, Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserGiftService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserGiftService.java index 5f4a5c21..64d48f8f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserGiftService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserGiftService.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserGift; import com.ruoyi.cai.dto.app.query.GiveGiftRes; -import com.ruoyi.cai.dto.app.vo.UserGiftVo; +import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; */ public interface CaiUserGiftService extends IService { - List selectGiftList(Long userId); + List selectGiftList(Long userId); boolean giveGift(GiveGiftRes query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserOnlineService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserOnlineService.java index 12f91b28..4fbf6627 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserOnlineService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserOnlineService.java @@ -2,6 +2,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserOnline; +import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; /** * 用户在线状态Service接口 @@ -11,4 +12,7 @@ import com.ruoyi.cai.domain.CaiUserOnline; */ public interface CaiUserOnlineService extends IService { + CaiUserOnline getByUserId(Long userId); + + OnlineStatusVo onlineStatus(Long userId, Integer openVideoStatus, Integer videoStatus, Integer isAnchor); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java index 58228730..522476bc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java @@ -50,24 +50,8 @@ public class CaiDynamicServiceImpl extends ServiceImpl selectDynamicList(Long userId, Integer limit) { - List list = this.list(Wrappers.lambdaQuery(CaiDynamic.class) - .eq(CaiDynamic::getUserId, userId) - .eq(CaiDynamic::getStatus, 1) - .orderByDesc(CaiDynamic::getCreateTime) - .last("limit "+ limit)); - List res = BeanConvertUtil.convertListTo(list, DynamicVo::new); - List dynamicIds = res.stream().filter(i -> i.getIsAttach() == 1).map(DynamicVo::getId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(dynamicIds)){ - List dynamicImages = dynamicImagesService.list(Wrappers.lambdaQuery(CaiDynamicImages.class) - .in(CaiDynamicImages::getDynamicId, dynamicIds)); - Map> map = - dynamicImages.stream().collect(Collectors.groupingBy(CaiDynamicImages::getDynamicId)); - for (DynamicVo re : res) { - List images = map.get(re.getId()); - re.setImageList(BeanConvertUtil.convertListTo(images, DynamicImageVo::new)); - } - } + public List selectDynamicImageList(Long userId, Integer limit) { + List res = baseMapper.selectDynamicImageList(userId,limit); return res; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java index b483b02f..b381f586 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.cai.service.impl; 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.cai.domain.CaiAnchor; import com.ruoyi.cai.domain.CaiConsumeLog; @@ -8,13 +9,16 @@ import com.ruoyi.cai.domain.CaiGuardTotal; import com.ruoyi.cai.domain.CaiUser; import com.ruoyi.cai.dto.app.dto.GuardNum; import com.ruoyi.cai.dto.app.query.GiveGuardReq; -import com.ruoyi.cai.dto.app.vo.GuardTotalVo; +import com.ruoyi.cai.dto.app.dto.GuardTotalDTO; +import com.ruoyi.cai.dto.app.vo.index.GuardIndexVo; +import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo; import com.ruoyi.cai.enums.ConsumeLogType; import com.ruoyi.cai.mapper.CaiGuardTotalMapper; import com.ruoyi.cai.service.CaiAccountService; import com.ruoyi.cai.service.CaiAnchorService; import com.ruoyi.cai.service.CaiGuardTotalService; import com.ruoyi.cai.service.CaiUserService; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +26,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; /** * 守护用户累计Service业务层处理 @@ -32,7 +37,7 @@ import java.util.List; @Service public class CaiGuardTotalServiceImpl extends ServiceImpl implements CaiGuardTotalService { - private final Integer GUARD_UNIT_PRICE = 1314; + private final Long GUARD_UNIT_PRICE = 1314L; @Autowired private CaiUserService userService; @Autowired @@ -41,8 +46,26 @@ public class CaiGuardTotalServiceImpl extends ServiceImpl selectGuardTotalLimit(Long fromUserId,Integer limit) { - return baseMapper.selectGuardTotal(fromUserId, limit); + public GuardIndexVo guardInfoVo(Long fromUserId, Long toUserId, Integer limit) { + GuardIndexVo vo = new GuardIndexVo(); + vo.setGuardPrice(GUARD_UNIT_PRICE); + // 查询守护总数 + Long count = baseMapper.guardCount(toUserId); + if(count > 0){ + List total = baseMapper.selectGuardTotal(toUserId, limit); + GuardTotalDTO maxUser = total.get(0); + vo.setUserList(total.stream().map(GuardTotalDTO::getAvatar).collect(Collectors.toList())); + vo.setNickname(maxUser.getNickname()); + vo.setAvatar(maxUser.getAvatar()); + vo.setUserId(maxUser.getToUserId()); + vo.setGuardSymbolTotal(count); + // 获取总数总人数 + vo.setGuardPersonTotal(baseMapper.guardPersonCount(toUserId)); + // 获取差距 + GuardNum guardNum = this.getGuardNum(fromUserId, toUserId); + vo.setDiffNum(guardNum.getDiffNum()); + } + return vo; } @Override @@ -102,4 +125,9 @@ public class CaiGuardTotalServiceImpl extends ServiceImpl userGuardPage(PageQuery pageQuery,Long userId) { + return baseMapper.userGuardPage(pageQuery.build(),userId); + } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserGiftServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserGiftServiceImpl.java index b2cdffce..c681a488 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserGiftServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserGiftServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.*; import com.ruoyi.cai.dto.app.query.GiveGiftRes; -import com.ruoyi.cai.dto.app.vo.UserGiftVo; +import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; import com.ruoyi.cai.enums.ConsumeLogType; import com.ruoyi.cai.mapper.CaiUserGiftMapper; import com.ruoyi.cai.service.*; @@ -36,7 +36,7 @@ public class CaiUserGiftServiceImpl extends ServiceImpl selectGiftList(Long userId) { + public List selectGiftList(Long userId) { return baseMapper.selectGiftList(userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserOnlineServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserOnlineServiceImpl.java index fc419d5c..8ae6e1ba 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserOnlineServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserOnlineServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.cai.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiUserOnline; +import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; import com.ruoyi.cai.mapper.CaiUserOnlineMapper; import com.ruoyi.cai.service.CaiUserOnlineService; import lombok.RequiredArgsConstructor; @@ -17,4 +19,40 @@ import org.springframework.stereotype.Service; @Service public class CaiUserOnlineServiceImpl extends ServiceImpl implements CaiUserOnlineService { + @Override + public CaiUserOnline getByUserId(Long userId){ + return this.getOne(Wrappers.lambdaQuery(CaiUserOnline.class).eq(CaiUserOnline::getUserId,userId).last("limit 1")); + } + + + @Override + public OnlineStatusVo onlineStatus(Long userId,Integer openVideoStatus,Integer videoStatus,Integer isAnchor){ + CaiUserOnline userOnline = this.getByUserId(userId); + Integer onlineStatus = userOnline.getStatus(); + Integer status = 0; + String statusMsg = "离线"; + if(isAnchor == 1){ + if(openVideoStatus == 1 && videoStatus == 0 && onlineStatus == 1){ + status = 1; + statusMsg = "空闲"; + }else if(videoStatus == 1){ + status = 2; + statusMsg = "忙碌中"; + }else if(openVideoStatus == 0){ + status = 3; + statusMsg = "勿扰"; + } + }else{ + if(onlineStatus == 1){ + status = 1; + statusMsg = "在线"; + } + } + OnlineStatusVo vo = new OnlineStatusVo(); + vo.setStatus(status); + vo.setOnlineStatus(onlineStatus); + vo.setStatusMsg(statusMsg); + return vo; + } + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java index bdd4597f..d36567a6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; import com.ruoyi.cai.dto.app.query.UserQuery; import com.ruoyi.cai.dto.app.vo.UserInfoVo; import com.ruoyi.cai.dto.app.vo.UserListVo; +import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; import com.ruoyi.cai.mapper.CaiUserMapper; import com.ruoyi.cai.service.*; import com.ruoyi.common.core.domain.PageQuery; @@ -37,6 +38,8 @@ public class CaiUserServiceImpl extends ServiceImpl impl private CaiDynamicService dynamicService; @Autowired private CaiUserGiftService userGiftService; + @Autowired + private CaiUserOnlineService userOnlineService; @Override public CaiUser getByUsername(String username) { @@ -84,13 +87,18 @@ public class CaiUserServiceImpl extends ServiceImpl impl vo.setStar(userFollowService.checkStar(currentUserId, userId)); vo.setAlbumList(caiUserAlbumService.getUserAlbum(userId,caiUser.getIsAnchor())); // 在线状态 - // vo.setStatus(); + OnlineStatusVo onlineStatusVo; + if(caiUser.getIsAnchor() == 1 && anchor != null){ + onlineStatusVo = userOnlineService.onlineStatus(userId,anchor.getOpenVideoStatus(),anchor.getVideoStatus(),caiUser.getIsAnchor()); + }else{ + onlineStatusVo = userOnlineService.onlineStatus(userId,0,0,caiUser.getIsAnchor()); + } + vo.setOnlineStatus(onlineStatusVo); if(caiUser.getIsAnchor() == 1){ - vo.setGuardTotalList(guardTotalService.selectGuardTotalLimit(userId,10)); -// vo.setDynamicList(dynamicService.selectDynamicList(userId,10)); + vo.setGuardIndexVo(guardTotalService.guardInfoVo(currentUserId,userId,10)); + vo.setDynamicList(dynamicService.selectDynamicImageList(userId,10)); vo.setGiftList(userGiftService.selectGiftList(userId)); } - return vo; } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml index 18e80cda..13e06fb9 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml @@ -33,6 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t1.create_time desc + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml index 4c801e97..56c335f6 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" guard_value = guard_value + #{guardValue} where to_user_id = #{toUserId} and from_user_id = #{fromUserId} - select t1.from_user_id,t1.to_user_id,t2.avatar,t1.guard_num from cai_guard_total t1 join cai_user t2 on t1.to_user_id = t2.id @@ -29,6 +29,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit #{limit} + + + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml index bae164c5..04e56344 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml @@ -14,8 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select + from_uid, + to_uid, + gift_id, t2.name, t2.img, t2.price,