From d89b912d648fc70ab24bebfbe89ec66960d41938 Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Sun, 31 Dec 2023 00:00:30 +0800 Subject: [PATCH] init --- .../com/ruoyi/cai/auth/CaiLoginManager.java | 28 ++++---- .../java/com/ruoyi/cai/chat/ChatManager.java | 27 ++++---- .../cai/controller/CaiGuardLogController.java | 12 ++-- .../admin/CaiAccountBankcardController.java | 12 ++-- .../admin/CaiAccountBusinessController.java | 12 ++-- .../admin/CaiAccountCashController.java | 18 +++--- .../admin/CaiAccountDetailController.java | 12 ++-- .../admin/CaiAccountRechargeController.java | 12 ++-- .../admin/CaiAnchorApplyController.java | 14 ++-- .../controller/admin/CaiAnchorController.java | 15 ++--- .../controller/admin/CaiBannerController.java | 12 ++-- .../admin/CaiDynamicController.java | 12 ++-- .../controller/admin/CaiGiftController.java | 12 ++-- .../admin/CaiGiveLogController.java | 12 ++-- .../controller/admin/CaiGoodsController.java | 12 ++-- .../admin/CaiLowHeightRiskController.java | 15 ++--- .../admin/CaiReportCateController.java | 12 ++-- .../controller/admin/CaiReportController.java | 12 ++-- .../controller/admin/CaiUnionController.java | 15 ++--- .../admin/CaiUnionUserController.java | 12 ++-- .../admin/CaiUserAlbumController.java | 12 ++-- .../admin/CaiUserCallController.java | 12 ++-- .../admin/CaiUserCameraAuditController.java | 12 ++-- .../controller/admin/CaiUserController.java | 15 ++--- .../admin/CaiUserCountController.java | 12 ++-- .../admin/CaiUserForbidController.java | 12 ++-- .../admin/CaiUserInviteController.java | 12 ++-- .../admin/CaiUserMemberController.java | 15 ++--- .../admin/CaiUserRiskLogController.java | 12 ++-- .../admin/CaiUserVisitorController.java | 12 ++-- .../admin/CaiWithdrawExchangeController.java | 12 ++-- .../cai/controller/app/IndexController.java | 4 +- .../controller/app/SettingAppController.java | 20 +++--- .../cai/controller/app/WalletController.java | 22 +++---- .../domain/{CaiAccount.java => Account.java} | 8 +-- ...ountBankcard.java => AccountBankcard.java} | 2 +- ...ountBusiness.java => AccountBusiness.java} | 2 +- .../{CaiAccountCash.java => AccountCash.java} | 2 +- ...iAccountDetail.java => AccountDetail.java} | 2 +- ...ountRecharge.java => AccountRecharge.java} | 2 +- .../domain/{CaiAnchor.java => Anchor.java} | 2 +- .../{CaiAnchorApply.java => AnchorApply.java} | 3 +- .../cai/domain/{CaiArea.java => Area.java} | 2 +- .../domain/{CaiBanner.java => Banner.java} | 2 +- .../com/ruoyi/cai/domain/CaiConsumeLog.java | 2 +- .../cai/domain/{CaiCitys.java => Citys.java} | 2 +- .../domain/{CaiDynamic.java => Dynamic.java} | 2 +- ...iDynamicImages.java => DynamicImages.java} | 2 +- .../cai/domain/{CaiGift.java => Gift.java} | 2 +- .../domain/{CaiGiveLog.java => GiveLog.java} | 2 +- .../cai/domain/{CaiGoods.java => Goods.java} | 2 +- .../{CaiGuardLog.java => GuardLog.java} | 2 +- .../{CaiGuardTotal.java => GuardTotal.java} | 2 +- ...iLowHeightRisk.java => LowHeightRisk.java} | 2 +- .../{CaiMemberSkill.java => MemberSkill.java} | 2 +- .../domain/{CaiReport.java => Report.java} | 2 +- .../{CaiReportCate.java => ReportCate.java} | 2 +- .../cai/domain/{CaiUnion.java => Union.java} | 2 +- .../{CaiUnionUser.java => UnionUser.java} | 2 +- .../cai/domain/{CaiUser.java => User.java} | 2 +- .../{CaiUserAlbum.java => UserAlbum.java} | 2 +- ...iUserBlacklist.java => UserBlacklist.java} | 2 +- .../{CaiUserCall.java => UserCall.java} | 2 +- ...rCameraAudit.java => UserCameraAudit.java} | 2 +- .../{CaiUserCodeGen.java => UserCodeGen.java} | 2 +- .../{CaiUserCount.java => UserCount.java} | 2 +- .../{CaiUserFollow.java => UserFollow.java} | 8 +-- ...lowDynamic.java => UserFollowDynamic.java} | 2 +- .../{CaiUserForbid.java => UserForbid.java} | 2 +- .../{CaiUserGift.java => UserGift.java} | 2 +- .../{CaiUserInfo.java => UserInfo.java} | 9 +-- .../{CaiUserInvite.java => UserInvite.java} | 2 +- .../{CaiUserMember.java => UserMember.java} | 2 +- .../{CaiUserOnline.java => UserOnline.java} | 2 +- .../{CaiUserRiskLog.java => UserRiskLog.java} | 2 +- .../{CaiUserVisitor.java => UserVisitor.java} | 2 +- ...rawExchange.java => WithdrawExchange.java} | 2 +- ...iAnchorAdminVo.java => AnchorAdminVo.java} | 4 +- ...lyAdminVo.java => AnchorApplyAdminVo.java} | 4 +- ...AdminVo.java => LowHeightRiskAdminVo.java} | 4 +- ...CaiUnionAdminVo.java => UnionAdminVo.java} | 4 +- .../{CaiUserAdminVo.java => UserAdminVo.java} | 4 +- .../cai/dto/admin/vo/UserCountAdminVo.java | 30 +++++++++ ...berAdminVo.java => UserMemberAdminVo.java} | 4 +- .../ruoyi/cai/manager/CurrentUserManager.java | 46 ++++++------- .../cai/mapper/CaiAccountBankcardMapper.java | 4 +- .../cai/mapper/CaiAccountBusinessMapper.java | 4 +- .../cai/mapper/CaiAccountCashMapper.java | 4 +- .../cai/mapper/CaiAccountDetailMapper.java | 4 +- .../ruoyi/cai/mapper/CaiAccountMapper.java | 4 +- .../cai/mapper/CaiAccountRechargeMapper.java | 4 +- .../cai/mapper/CaiAnchorApplyMapper.java | 8 +-- .../com/ruoyi/cai/mapper/CaiAnchorMapper.java | 8 +-- .../com/ruoyi/cai/mapper/CaiAreaMapper.java | 4 +- .../com/ruoyi/cai/mapper/CaiBannerMapper.java | 4 +- .../com/ruoyi/cai/mapper/CaiCitysMapper.java | 4 +- .../cai/mapper/CaiDynamicImagesMapper.java | 4 +- .../ruoyi/cai/mapper/CaiDynamicMapper.java | 4 +- .../com/ruoyi/cai/mapper/CaiGiftMapper.java | 4 +- .../ruoyi/cai/mapper/CaiGiveLogMapper.java | 4 +- .../com/ruoyi/cai/mapper/CaiGoodsMapper.java | 4 +- .../ruoyi/cai/mapper/CaiGuardLogMapper.java | 4 +- .../ruoyi/cai/mapper/CaiGuardTotalMapper.java | 4 +- .../cai/mapper/CaiLowHeightRiskMapper.java | 8 +-- .../cai/mapper/CaiMemberSkillMapper.java | 4 +- .../ruoyi/cai/mapper/CaiReportCateMapper.java | 4 +- .../com/ruoyi/cai/mapper/CaiReportMapper.java | 4 +- .../com/ruoyi/cai/mapper/CaiUnionMapper.java | 8 +-- .../ruoyi/cai/mapper/CaiUnionUserMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserAlbumMapper.java | 4 +- .../cai/mapper/CaiUserBlacklistMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserCallMapper.java | 4 +- .../cai/mapper/CaiUserCameraAuditMapper.java | 4 +- .../cai/mapper/CaiUserCodeGenMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserCountMapper.java | 4 +- .../mapper/CaiUserFollowDynamicMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserFollowMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserForbidMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserGiftMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserInfoMapper.java | 4 +- .../ruoyi/cai/mapper/CaiUserInviteMapper.java | 4 +- .../com/ruoyi/cai/mapper/CaiUserMapper.java | 8 +-- .../ruoyi/cai/mapper/CaiUserMemberMapper.java | 8 +-- .../ruoyi/cai/mapper/CaiUserOnlineMapper.java | 4 +- .../cai/mapper/CaiUserRiskLogMapper.java | 4 +- .../cai/mapper/CaiUserVisitorMapper.java | 4 +- .../cai/mapper/CaiWithdrawExchangeMapper.java | 4 +- .../service/CaiAccountBankcardService.java | 4 +- .../service/CaiAccountBusinessService.java | 4 +- .../cai/service/CaiAccountCashService.java | 4 +- .../cai/service/CaiAccountDetailService.java | 4 +- .../service/CaiAccountRechargeService.java | 4 +- .../ruoyi/cai/service/CaiAccountService.java | 6 +- .../cai/service/CaiAnchorApplyService.java | 10 +-- .../ruoyi/cai/service/CaiAnchorService.java | 10 +-- .../com/ruoyi/cai/service/CaiAreaService.java | 4 +- .../ruoyi/cai/service/CaiBannerService.java | 6 +- .../ruoyi/cai/service/CaiCitysService.java | 4 +- .../cai/service/CaiDynamicImagesService.java | 4 +- .../ruoyi/cai/service/CaiDynamicService.java | 5 +- .../com/ruoyi/cai/service/CaiGiftService.java | 6 +- .../ruoyi/cai/service/CaiGiveLogService.java | 4 +- .../ruoyi/cai/service/CaiGoodsService.java | 4 +- .../ruoyi/cai/service/CaiGuardLogService.java | 4 +- .../cai/service/CaiGuardTotalService.java | 4 +- .../cai/service/CaiLowHeightRiskService.java | 8 +-- .../cai/service/CaiMemberSkillService.java | 4 +- .../cai/service/CaiReportCateService.java | 4 +- .../ruoyi/cai/service/CaiReportService.java | 4 +- .../ruoyi/cai/service/CaiUnionService.java | 8 +-- .../cai/service/CaiUnionUserService.java | 6 +- .../cai/service/CaiUserAlbumService.java | 6 +- .../cai/service/CaiUserBlacklistService.java | 4 +- .../ruoyi/cai/service/CaiUserCallService.java | 10 +-- .../service/CaiUserCameraAuditService.java | 6 +- .../cai/service/CaiUserCodeGenService.java | 4 +- .../cai/service/CaiUserCountService.java | 6 +- .../service/CaiUserFollowDynamicService.java | 4 +- .../cai/service/CaiUserFollowService.java | 4 +- .../cai/service/CaiUserForbidService.java | 4 +- .../ruoyi/cai/service/CaiUserGiftService.java | 4 +- .../ruoyi/cai/service/CaiUserInfoService.java | 4 +- .../cai/service/CaiUserInviteService.java | 6 +- .../cai/service/CaiUserMemberService.java | 8 +-- .../cai/service/CaiUserOnlineService.java | 6 +- .../cai/service/CaiUserRiskLogService.java | 4 +- .../com/ruoyi/cai/service/CaiUserService.java | 12 ++-- .../cai/service/CaiUserVisitorService.java | 4 +- .../service/CaiWithdrawExchangeService.java | 4 +- .../impl/CaiAccountBankcardServiceImpl.java | 4 +- .../impl/CaiAccountBusinessServiceImpl.java | 4 +- .../impl/CaiAccountCashServiceImpl.java | 16 ++--- .../impl/CaiAccountDetailServiceImpl.java | 5 +- .../impl/CaiAccountRechargeServiceImpl.java | 4 +- .../service/impl/CaiAccountServiceImpl.java | 26 ++++---- .../impl/CaiAnchorApplyServiceImpl.java | 26 ++++---- .../service/impl/CaiAnchorServiceImpl.java | 19 +++--- .../cai/service/impl/CaiAreaServiceImpl.java | 4 +- .../service/impl/CaiBannerServiceImpl.java | 8 +-- .../cai/service/impl/CaiCitysServiceImpl.java | 8 +-- .../impl/CaiDynamicImagesServiceImpl.java | 4 +- .../service/impl/CaiDynamicServiceImpl.java | 34 +++++----- .../cai/service/impl/CaiGiftServiceImpl.java | 12 ++-- .../service/impl/CaiGiveLogServiceImpl.java | 4 +- .../cai/service/impl/CaiGoodsServiceImpl.java | 4 +- .../service/impl/CaiGuardLogServiceImpl.java | 4 +- .../impl/CaiGuardTotalServiceImpl.java | 34 +++++----- .../impl/CaiLowHeightRiskServiceImpl.java | 8 +-- .../impl/CaiMemberSkillServiceImpl.java | 4 +- .../impl/CaiReportCateServiceImpl.java | 4 +- .../service/impl/CaiReportServiceImpl.java | 10 +-- .../cai/service/impl/CaiUnionServiceImpl.java | 8 +-- .../service/impl/CaiUnionUserServiceImpl.java | 10 +-- .../service/impl/CaiUserAlbumServiceImpl.java | 36 +++++------ .../impl/CaiUserBlacklistServiceImpl.java | 14 ++-- .../service/impl/CaiUserCallServiceImpl.java | 32 +++++----- .../impl/CaiUserCameraAuditServiceImpl.java | 23 +++---- .../impl/CaiUserCodeGenServiceImpl.java | 4 +- .../service/impl/CaiUserCountServiceImpl.java | 20 +++--- .../impl/CaiUserFollowDynamicServiceImpl.java | 22 +++---- .../impl/CaiUserFollowServiceImpl.java | 28 ++++---- .../impl/CaiUserForbidServiceImpl.java | 4 +- .../service/impl/CaiUserGiftServiceImpl.java | 12 ++-- .../service/impl/CaiUserInfoServiceImpl.java | 4 +- .../impl/CaiUserInviteServiceImpl.java | 9 ++- .../impl/CaiUserMemberServiceImpl.java | 8 +-- .../impl/CaiUserOnlineServiceImpl.java | 10 +-- .../impl/CaiUserRiskLogServiceImpl.java | 4 +- .../cai/service/impl/CaiUserServiceImpl.java | 64 +++++++++---------- .../impl/CaiUserVisitorServiceImpl.java | 12 ++-- .../impl/CaiWithdrawExchangeServiceImpl.java | 4 +- .../java/com/ruoyi/cai/ws/dto/WsRMsgGen.java | 4 +- .../handler/message/AgreeMessageHandle.java | 10 +-- .../handler/message/CancelMessageHandler.java | 8 +-- .../handler/message/GiftMessageHandler.java | 8 +-- .../handler/message/RefuseMessageHandler.java | 8 +-- .../cai/ws/manager/WebSocketManager.java | 16 ++--- .../com/ruoyi/cai/ws/service/RoomService.java | 4 +- .../ruoyi/cai/ws/service/SettleService.java | 4 +- .../mapper/cai/CaiAccountBankcardMapper.xml | 2 +- .../mapper/cai/CaiAccountBusinessMapper.xml | 2 +- .../mapper/cai/CaiAccountCashMapper.xml | 2 +- .../mapper/cai/CaiAccountDetailMapper.xml | 2 +- .../resources/mapper/cai/CaiAccountMapper.xml | 2 +- .../mapper/cai/CaiAccountRechargeMapper.xml | 2 +- .../mapper/cai/CaiAnchorApplyMapper.xml | 4 +- .../resources/mapper/cai/CaiAnchorMapper.xml | 4 +- .../resources/mapper/cai/CaiAreaMapper.xml | 2 +- .../resources/mapper/cai/CaiBannerMapper.xml | 2 +- .../resources/mapper/cai/CaiCitysMapper.xml | 2 +- .../mapper/cai/CaiDynamicImagesMapper.xml | 2 +- .../resources/mapper/cai/CaiDynamicMapper.xml | 2 +- .../resources/mapper/cai/CaiGiftMapper.xml | 2 +- .../resources/mapper/cai/CaiGiveLogMapper.xml | 2 +- .../resources/mapper/cai/CaiGoodsMapper.xml | 2 +- .../mapper/cai/CaiGuardLogMapper.xml | 2 +- .../mapper/cai/CaiGuardTotalMapper.xml | 2 +- .../mapper/cai/CaiLowHeightRiskMapper.xml | 4 +- .../mapper/cai/CaiMemberSkillMapper.xml | 2 +- .../mapper/cai/CaiReportCateMapper.xml | 2 +- .../resources/mapper/cai/CaiReportMapper.xml | 2 +- .../resources/mapper/cai/CaiSkillMapper.xml | 15 ----- .../resources/mapper/cai/CaiUnionMapper.xml | 4 +- .../mapper/cai/CaiUnionUserMapper.xml | 2 +- .../mapper/cai/CaiUserAlbumMapper.xml | 2 +- .../mapper/cai/CaiUserBlacklistMapper.xml | 2 +- .../mapper/cai/CaiUserCallMapper.xml | 2 +- .../mapper/cai/CaiUserCameraAuditMapper.xml | 2 +- .../mapper/cai/CaiUserCodeGenMapper.xml | 2 +- .../mapper/cai/CaiUserCountMapper.xml | 2 +- .../mapper/cai/CaiUserFollowDynamicMapper.xml | 2 +- .../mapper/cai/CaiUserFollowMapper.xml | 2 +- .../mapper/cai/CaiUserForbidMapper.xml | 2 +- .../mapper/cai/CaiUserGiftMapper.xml | 2 +- .../mapper/cai/CaiUserInviteMapper.xml | 2 +- .../resources/mapper/cai/CaiUserMapper.xml | 4 +- .../mapper/cai/CaiUserMemberMapper.xml | 4 +- .../mapper/cai/CaiUserOnlineMapper.xml | 2 +- .../mapper/cai/CaiUserRiskLogMapper.xml | 2 +- .../mapper/cai/CaiUserVisitorMapper.xml | 2 +- .../mapper/cai/CaiWithdrawExchangeMapper.xml | 2 +- 261 files changed, 911 insertions(+), 929 deletions(-) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAccount.java => Account.java} (83%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAccountBankcard.java => AccountBankcard.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAccountBusiness.java => AccountBusiness.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAccountCash.java => AccountCash.java} (96%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAccountDetail.java => AccountDetail.java} (96%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAccountRecharge.java => AccountRecharge.java} (96%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAnchor.java => Anchor.java} (97%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiAnchorApply.java => AnchorApply.java} (92%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiArea.java => Area.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiBanner.java => Banner.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiCitys.java => Citys.java} (92%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiDynamic.java => Dynamic.java} (94%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiDynamicImages.java => DynamicImages.java} (94%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiGift.java => Gift.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiGiveLog.java => GiveLog.java} (96%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiGoods.java => Goods.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiGuardLog.java => GuardLog.java} (94%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiGuardTotal.java => GuardTotal.java} (94%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiLowHeightRisk.java => LowHeightRisk.java} (93%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiMemberSkill.java => MemberSkill.java} (93%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiReport.java => Report.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiReportCate.java => ReportCate.java} (92%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUnion.java => Union.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUnionUser.java => UnionUser.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUser.java => User.java} (98%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserAlbum.java => UserAlbum.java} (94%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserBlacklist.java => UserBlacklist.java} (91%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserCall.java => UserCall.java} (97%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserCameraAudit.java => UserCameraAudit.java} (94%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserCodeGen.java => UserCodeGen.java} (88%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserCount.java => UserCount.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserFollow.java => UserFollow.java} (78%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserFollowDynamic.java => UserFollowDynamic.java} (90%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserForbid.java => UserForbid.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserGift.java => UserGift.java} (94%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserInfo.java => UserInfo.java} (87%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserInvite.java => UserInvite.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserMember.java => UserMember.java} (95%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserOnline.java => UserOnline.java} (93%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserRiskLog.java => UserRiskLog.java} (92%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiUserVisitor.java => UserVisitor.java} (93%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiWithdrawExchange.java => WithdrawExchange.java} (92%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/{CaiAnchorAdminVo.java => AnchorAdminVo.java} (83%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/{CaiAnchorApplyAdminVo.java => AnchorApplyAdminVo.java} (74%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/{CaiLowHeightRiskAdminVo.java => LowHeightRiskAdminVo.java} (78%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/{CaiUnionAdminVo.java => UnionAdminVo.java} (86%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/{CaiUserAdminVo.java => UserAdminVo.java} (82%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/{CaiUserMemberAdminVo.java => UserMemberAdminVo.java} (82%) delete mode 100644 ruoyi-cai/src/main/resources/mapper/cai/CaiSkillMapper.xml diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java index 1062861c..4603fd79 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java @@ -2,8 +2,8 @@ package com.ruoyi.cai.auth; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.domain.CaiUserInfo; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserInfo; import com.ruoyi.cai.executor.ExecutorConstant; import com.ruoyi.cai.service.CaiUserInfoService; import com.ruoyi.cai.service.CaiUserService; @@ -34,11 +34,11 @@ public class CaiLoginManager { public String login(String username,String password){ - CaiUser caiUser = caiUserService.getByUsername(username); - if(caiUser == null){ + User user = caiUserService.getByUsername(username); + if(user == null){ throw new ServiceException("用户不存在或密码错误"); } - if(caiUser.getStatus() != 0){ + if(user.getStatus() != 0){ throw new ServiceException("用户已封禁，请联系客服"); } /*if(!BCrypt.checkpw(password, caiUser.getPassword())){ @@ -56,28 +56,28 @@ public class CaiLoginManager { // loginUser.setOs(); loginUser.setMenuPermission(Collections.emptySet()); loginUser.setRolePermission(Collections.emptySet()); - loginUser.setUsername(caiUser.getMobile()); + loginUser.setUsername(user.getMobile()); loginUser.setRoles(Collections.emptyList()); loginUser.setRoleId(null); - loginUser.setUserId(caiUser.getId()); + loginUser.setUserId(user.getId()); loginUser.setUserType(UserType.APP_USER.getUserType()); LoginHelper.login(loginUser); sysLoginService.recordLogininfor(loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); String clientIP = ServletUtils.getClientIP(); - ExecutorConstant.COMMON_EXECUTOR.execute(() -> recordLoginInfo(caiUser,clientIP)); + ExecutorConstant.COMMON_EXECUTOR.execute(() -> recordLoginInfo(user,clientIP)); return StpUtil.getTokenValue(); } @Autowired private CaiUserInfoService caiUserInfoService; - public void recordLoginInfo(CaiUser caiUser,String ip) { + public void recordLoginInfo(User user, String ip) { String address = AddressUtils.getRealAddressByIP(ip); - CaiUserInfo caiUserInfo = caiUserInfoService.getById(caiUser.getId()); - CaiUserInfo update = new CaiUserInfo(); - update.setUserId(caiUser.getId()); - update.setLoginCount(caiUserInfo.getLoginCount()+1); - update.setPrevLoginTime(caiUserInfo.getLastLoginTime()); + UserInfo userInfo = caiUserInfoService.getById(user.getId()); + UserInfo update = new UserInfo(); + update.setUserId(user.getId()); + update.setLoginCount(userInfo.getLoginCount()+1); + update.setPrevLoginTime(userInfo.getLastLoginTime()); update.setLastLoginIp(ip); update.setLastLoginTime(LocalDateTime.now()); update.setLastLocation(address); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java index ba61e463..9102db49 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java @@ -1,9 +1,9 @@ package com.ruoyi.cai.chat; import com.ruoyi.cai.config.CaiProperties; -import com.ruoyi.cai.domain.CaiAnchor; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserCall; import com.ruoyi.cai.dto.app.dto.GuardNum; import com.ruoyi.cai.dto.app.query.CallReq; import com.ruoyi.cai.dto.app.vo.chat.CallResp; @@ -18,7 +18,6 @@ import com.ruoyi.cai.ws.bean.Room; import com.ruoyi.cai.ws.manager.WebSocketManager; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -47,22 +46,22 @@ public class ChatManager { public CallResp call(CallReq callReq){ Long userId = LoginHelper.getUserId(); - CaiUser fromUser = userService.getById(userId); - CaiUser toUser = userService.getById(callReq.getToUid()); + User fromUser = userService.getById(userId); + User toUser = userService.getById(callReq.getToUid()); if(toUser.getIsAnchor() != 1){ throw new ServiceException("对方未通过女神认证，不能接听视频"); } if(fromUser.getGender() == 1 && toUser.getGender() == 1){ throw new ServiceException("主播和主播之间，不可以拨打视频哦~"); } - CaiAnchor anchor = anchorService.getByUserId(toUser.getId()); + Anchor anchor = anchorService.getByUserId(toUser.getId()); if(anchor == null){ throw new ServiceException("主播技能不存在"); } Long roomId = null; Room room = webSocketManager.checkOnlineRoom(fromUser.getId(), toUser.getId()); if(room == null){ - CaiUserCall call = userCallService.createCall(fromUser, toUser, anchor); + UserCall call = userCallService.createCall(fromUser, toUser, anchor); roomId = webSocketManager.createRoom(call.getId()); } String weSocketUrl = String.format(properties.getWebSocketUrl(),"token",roomId); @@ -89,7 +88,7 @@ public class ChatManager { public GetRoomResp getRoom(String roomId){ Long userId = LoginHelper.getUserId(); - CaiUserCall userCall = userCallService.getById(roomId); + UserCall userCall = userCallService.getById(roomId); if(userCall == null){ throw new ServiceException("房间不存在"); } @@ -100,11 +99,11 @@ public class ChatManager { if (room == null) { throw new ServiceException("'对方已取消通话'"); } - List userList = userService.listByIds(Arrays.asList(userCall.getFromUid(), userCall.getToUid())); - Map userMap = userList.stream().collect(Collectors.toMap(CaiUser::getId, Function.identity())); - CaiUser fromUser = userMap.get(userCall.getFromUid()); - CaiUser toUser = userMap.get(userCall.getToUid()); - CaiAnchor anchor = anchorService.getByUserId(toUser.getId()); + List userList = userService.listByIds(Arrays.asList(userCall.getFromUid(), userCall.getToUid())); + Map userMap = userList.stream().collect(Collectors.toMap(User::getId, Function.identity())); + User fromUser = userMap.get(userCall.getFromUid()); + User toUser = userMap.get(userCall.getToUid()); + Anchor anchor = anchorService.getByUserId(toUser.getId()); String weSocketUrl = String.format(properties.getWebSocketUrl(),"token",roomId); GetRoomResp getRoomResp = new GetRoomResp(); getRoomResp.setRoomId(userCall.getId()+""); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java index 55bec06f..66b79a7d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiGuardLog; +import com.ruoyi.cai.domain.GuardLog; import com.ruoyi.cai.service.CaiGuardLogService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiGuardLogController extends BaseController { */ @SaCheckPermission("cai:guardLog:list") @GetMapping("/list") - public TableDataInfo list(CaiGuardLog bo, PageQuery pageQuery) { - Page page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(GuardLog bo, PageQuery pageQuery) { + Page page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiGuardLogController extends BaseController { */ @SaCheckPermission("cai:guardLog:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(iCaiGuardLogService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiGuardLogController extends BaseController { @Log(title = "守护赠送流水", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiGuardLog bo) { + public R add(@Validated(AddGroup.class) @RequestBody GuardLog bo) { return toAjax(iCaiGuardLogService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiGuardLogController extends BaseController { @Log(title = "守护赠送流水", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiGuardLog bo) { + public R edit(@Validated(EditGroup.class) @RequestBody GuardLog bo) { return toAjax(iCaiGuardLogService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java index 3072dfd4..925c94ef 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAccountBankcard; +import com.ruoyi.cai.domain.AccountBankcard; import com.ruoyi.cai.service.CaiAccountBankcardService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiAccountBankcardController extends BaseController { */ @SaCheckPermission("cai:accountBankcard:list") @GetMapping("/list") - public TableDataInfo list(CaiAccountBankcard bo, PageQuery pageQuery) { - Page page = accountBankcardService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(AccountBankcard bo, PageQuery pageQuery) { + Page page = accountBankcardService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiAccountBankcardController extends BaseController { */ @SaCheckPermission("cai:accountBankcard:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(accountBankcardService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiAccountBankcardController extends BaseController { @Log(title = "用户银行卡", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiAccountBankcard bo) { + public R add(@Validated(AddGroup.class) @RequestBody AccountBankcard bo) { return toAjax(accountBankcardService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiAccountBankcardController extends BaseController { @Log(title = "用户银行卡", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiAccountBankcard bo) { + public R edit(@Validated(EditGroup.class) @RequestBody AccountBankcard bo) { return toAjax(accountBankcardService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java index 82034638..de7e8ebe 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAccountBusiness; +import com.ruoyi.cai.domain.AccountBusiness; import com.ruoyi.cai.service.CaiAccountBusinessService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiAccountBusinessController extends BaseController { */ @SaCheckPermission("cai:accountBusiness:list") @GetMapping("/list") - public TableDataInfo list(CaiAccountBusiness bo, PageQuery pageQuery) { - Page page = caiAccountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(AccountBusiness bo, PageQuery pageQuery) { + Page page = caiAccountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiAccountBusinessController extends BaseController { */ @SaCheckPermission("cai:accountBusiness:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiAccountBusinessService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiAccountBusinessController extends BaseController { @Log(title = "账户业务", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiAccountBusiness bo) { + public R add(@Validated(AddGroup.class) @RequestBody AccountBusiness bo) { return toAjax(caiAccountBusinessService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiAccountBusinessController extends BaseController { @Log(title = "账户业务", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiAccountBusiness bo) { + public R edit(@Validated(EditGroup.class) @RequestBody AccountBusiness bo) { return toAjax(caiAccountBusinessService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java index 2490938c..df13b889 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAccountCash; +import com.ruoyi.cai.domain.AccountCash; import com.ruoyi.cai.service.CaiAccountCashService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -44,8 +44,8 @@ public class CaiAccountCashController extends BaseController { */ @SaCheckPermission("cai:accountCash:list") @GetMapping("/list") - public TableDataInfo list(CaiAccountCash bo, PageQuery pageQuery) { - Page page = accountCashService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(AccountCash bo, PageQuery pageQuery) { + Page page = accountCashService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -55,9 +55,9 @@ public class CaiAccountCashController extends BaseController { @SaCheckPermission("cai:accountCash:export") @Log(title = "用户提现记录", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(CaiAccountCash bo, HttpServletResponse response) { - List list = accountCashService.list(Wrappers.lambdaQuery(bo)); - ExcelUtil.exportExcel(list, "用户提现记录", CaiAccountCash.class, response); + public void export(AccountCash bo, HttpServletResponse response) { + List list = accountCashService.list(Wrappers.lambdaQuery(bo)); + ExcelUtil.exportExcel(list, "用户提现记录", AccountCash.class, response); } /** @@ -67,7 +67,7 @@ public class CaiAccountCashController extends BaseController { */ @SaCheckPermission("cai:accountCash:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(accountCashService.getById(id)); } @@ -79,7 +79,7 @@ public class CaiAccountCashController extends BaseController { @Log(title = "用户提现记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiAccountCash bo) { + public R add(@Validated(AddGroup.class) @RequestBody AccountCash bo) { return toAjax(accountCashService.save(bo)); } @@ -90,7 +90,7 @@ public class CaiAccountCashController extends BaseController { @Log(title = "用户提现记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiAccountCash bo) { + public R edit(@Validated(EditGroup.class) @RequestBody AccountCash bo) { return toAjax(accountCashService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java index f7d44cd8..1ea28b2e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAccountDetail; +import com.ruoyi.cai.domain.AccountDetail; import com.ruoyi.cai.service.CaiAccountDetailService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiAccountDetailController extends BaseController { */ @SaCheckPermission("cai:accountDetail:list") @GetMapping("/list") - public TableDataInfo list(CaiAccountDetail bo, PageQuery pageQuery) { - Page page = caiAccountDetailService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(AccountDetail bo, PageQuery pageQuery) { + Page page = caiAccountDetailService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiAccountDetailController extends BaseController { */ @SaCheckPermission("cai:accountDetail:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiAccountDetailService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiAccountDetailController extends BaseController { @Log(title = "账户明细", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiAccountDetail bo) { + public R add(@Validated(AddGroup.class) @RequestBody AccountDetail bo) { return toAjax(caiAccountDetailService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiAccountDetailController extends BaseController { @Log(title = "账户明细", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiAccountDetail bo) { + public R edit(@Validated(EditGroup.class) @RequestBody AccountDetail bo) { return toAjax(caiAccountDetailService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java index 36bf87da..d16bd96d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAccountRecharge; +import com.ruoyi.cai.domain.AccountRecharge; import com.ruoyi.cai.service.CaiAccountRechargeService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiAccountRechargeController extends BaseController { */ @SaCheckPermission("cai:accountRecharge:list") @GetMapping("/list") - public TableDataInfo list(CaiAccountRecharge bo, PageQuery pageQuery) { - Page page = caiAccountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(AccountRecharge bo, PageQuery pageQuery) { + Page page = caiAccountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiAccountRechargeController extends BaseController { */ @SaCheckPermission("cai:accountRecharge:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiAccountRechargeService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiAccountRechargeController extends BaseController { @Log(title = "充值记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiAccountRecharge bo) { + public R add(@Validated(AddGroup.class) @RequestBody AccountRecharge bo) { return toAjax(caiAccountRechargeService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiAccountRechargeController extends BaseController { @Log(title = "充值记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiAccountRecharge bo) { + public R edit(@Validated(EditGroup.class) @RequestBody AccountRecharge bo) { return toAjax(caiAccountRechargeService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java index 23137473..835528f4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java @@ -2,8 +2,8 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAnchorApply; -import com.ruoyi.cai.dto.admin.vo.CaiAnchorApplyAdminVo; +import com.ruoyi.cai.domain.AnchorApply; +import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo; import com.ruoyi.cai.service.CaiAnchorApplyService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiAnchorApplyController extends BaseController { */ @SaCheckPermission("cai:anchorApply:list") @GetMapping("/list") - public TableDataInfo list(CaiAnchorApplyAdminVo bo, PageQuery pageQuery) { - Page page = anchorApplyService.pageAdmin(pageQuery,bo); + public TableDataInfo list(AnchorApplyAdminVo bo, PageQuery pageQuery) { + Page page = anchorApplyService.pageAdmin(pageQuery,bo); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiAnchorApplyController extends BaseController { */ @SaCheckPermission("cai:anchorApply:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(anchorApplyService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiAnchorApplyController extends BaseController { @Log(title = "播主申请管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiAnchorApply bo) { + public R add(@Validated(AddGroup.class) @RequestBody AnchorApply bo) { return toAjax(anchorApplyService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiAnchorApplyController extends BaseController { @Log(title = "播主申请管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiAnchorApply bo) { + public R edit(@Validated(EditGroup.class) @RequestBody AnchorApply bo) { return toAjax(anchorApplyService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java index 20bf2960..f7d2d898 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java @@ -2,9 +2,8 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAnchor; -import com.ruoyi.cai.dto.admin.vo.CaiAnchorAdminVo; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo; import com.ruoyi.cai.service.CaiAnchorService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -42,8 +41,8 @@ public class CaiAnchorController extends BaseController { */ @SaCheckPermission("cai:anchor:list") @GetMapping("/list") - public TableDataInfo list(CaiAnchorAdminVo bo, PageQuery pageQuery) { - IPage page = caiAnchorService.pageAdmin(pageQuery, bo); + public TableDataInfo list(AnchorAdminVo bo, PageQuery pageQuery) { + IPage page = caiAnchorService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -55,7 +54,7 @@ public class CaiAnchorController extends BaseController { */ @SaCheckPermission("cai:anchor:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(caiAnchorService.getById(id)); } @@ -67,7 +66,7 @@ public class CaiAnchorController extends BaseController { @Log(title = "女神列表", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiAnchor bo) { + public R add(@Validated(AddGroup.class) @RequestBody Anchor bo) { return toAjax(caiAnchorService.save(bo)); } @@ -78,7 +77,7 @@ public class CaiAnchorController extends BaseController { @Log(title = "女神列表", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiAnchor bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Anchor bo) { return toAjax(caiAnchorService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java index aa16cfb2..a79856f6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiBanner; +import com.ruoyi.cai.domain.Banner; import com.ruoyi.cai.service.CaiBannerService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiBannerController extends BaseController { */ @SaCheckPermission("cai:banner:list") @GetMapping("/list") - public TableDataInfo list(CaiBanner bo, PageQuery pageQuery) { - Page page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(Banner bo, PageQuery pageQuery) { + Page page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -54,7 +54,7 @@ public class CaiBannerController extends BaseController { */ @SaCheckPermission("cai:banner:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(bannerService.getById(id)); } @@ -66,7 +66,7 @@ public class CaiBannerController extends BaseController { @Log(title = "轮播", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiBanner bo) { + public R add(@Validated(AddGroup.class) @RequestBody Banner bo) { return toAjax(bannerService.save(bo)); } @@ -77,7 +77,7 @@ public class CaiBannerController extends BaseController { @Log(title = "轮播", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiBanner bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Banner bo) { return toAjax(bannerService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java index 7ca251b5..80710da5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiDynamic; +import com.ruoyi.cai.domain.Dynamic; import com.ruoyi.cai.service.CaiDynamicService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiDynamicController extends BaseController { */ @SaCheckPermission("cai:dynamic:list") @GetMapping("/list") - public TableDataInfo list(CaiDynamic bo, PageQuery pageQuery) { - Page page = caiDynamicService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(Dynamic bo, PageQuery pageQuery) { + Page page = caiDynamicService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiDynamicController extends BaseController { */ @SaCheckPermission("cai:dynamic:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiDynamicService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiDynamicController extends BaseController { @Log(title = "主播动态", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiDynamic bo) { + public R add(@Validated(AddGroup.class) @RequestBody Dynamic bo) { return toAjax(caiDynamicService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiDynamicController extends BaseController { @Log(title = "主播动态", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiDynamic bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Dynamic bo) { return toAjax(caiDynamicService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java index 9747051d..f11c94d0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiGift; +import com.ruoyi.cai.domain.Gift; import com.ruoyi.cai.service.CaiGiftService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiGiftController extends BaseController { */ @SaCheckPermission("cai:gift:list") @GetMapping("/list") - public TableDataInfo list(CaiGift bo, PageQuery pageQuery) { - Page page = caiGiftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(Gift bo, PageQuery pageQuery) { + Page page = caiGiftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiGiftController extends BaseController { */ @SaCheckPermission("cai:gift:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(caiGiftService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiGiftController extends BaseController { @Log(title = "礼物", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiGift bo) { + public R add(@Validated(AddGroup.class) @RequestBody Gift bo) { return toAjax(caiGiftService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiGiftController extends BaseController { @Log(title = "礼物", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiGift bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Gift bo) { return toAjax(caiGiftService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java index db05b949..dfbd2585 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiGiveLog; +import com.ruoyi.cai.domain.GiveLog; import com.ruoyi.cai.service.CaiGiveLogService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiGiveLogController extends BaseController { */ @SaCheckPermission("cai:giveLog:list") @GetMapping("/list") - public TableDataInfo list(CaiGiveLog bo, PageQuery pageQuery) { - Page page = caiGiveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(GiveLog bo, PageQuery pageQuery) { + Page page = caiGiveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiGiveLogController extends BaseController { */ @SaCheckPermission("cai:giveLog:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiGiveLogService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiGiveLogController extends BaseController { @Log(title = "赠送记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiGiveLog bo) { + public R add(@Validated(AddGroup.class) @RequestBody GiveLog bo) { return toAjax(caiGiveLogService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiGiveLogController extends BaseController { @Log(title = "赠送记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiGiveLog bo) { + public R edit(@Validated(EditGroup.class) @RequestBody GiveLog bo) { return toAjax(caiGiveLogService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java index ab895a2f..be50d5a8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiGoods; +import com.ruoyi.cai.domain.Goods; import com.ruoyi.cai.service.CaiGoodsService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiGoodsController extends BaseController { */ @SaCheckPermission("cai:goods:list") @GetMapping("/list") - public TableDataInfo list(CaiGoods bo, PageQuery pageQuery) { - Page page = caiGoodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(Goods bo, PageQuery pageQuery) { + Page page = caiGoodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiGoodsController extends BaseController { */ @SaCheckPermission("cai:goods:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiGoodsService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiGoodsController extends BaseController { @Log(title = "充值配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiGoods bo) { + public R add(@Validated(AddGroup.class) @RequestBody Goods bo) { return toAjax(caiGoodsService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiGoodsController extends BaseController { @Log(title = "充值配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiGoods bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Goods bo) { return toAjax(caiGoodsService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java index 5c58499b..3682eeb9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java @@ -1,10 +1,9 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiLowHeightRisk; -import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo; +import com.ruoyi.cai.domain.LowHeightRisk; +import com.ruoyi.cai.dto.admin.vo.LowHeightRiskAdminVo; import com.ruoyi.cai.service.CaiLowHeightRiskService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -42,8 +41,8 @@ public class CaiLowHeightRiskController extends BaseController { */ @SaCheckPermission("cai:lowHeightRisk:list") @GetMapping("/list") - public TableDataInfo list(CaiLowHeightRiskAdminVo bo, PageQuery pageQuery) { - Page page = lowHeightRiskService.pageAdmin(pageQuery, bo); + public TableDataInfo list(LowHeightRiskAdminVo bo, PageQuery pageQuery) { + Page page = lowHeightRiskService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -55,7 +54,7 @@ public class CaiLowHeightRiskController extends BaseController { */ @SaCheckPermission("cai:lowHeightRisk:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(lowHeightRiskService.getById(id)); } @@ -67,7 +66,7 @@ public class CaiLowHeightRiskController extends BaseController { @Log(title = "高风险用户记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiLowHeightRisk bo) { + public R add(@Validated(AddGroup.class) @RequestBody LowHeightRisk bo) { return toAjax(lowHeightRiskService.save(bo)); } @@ -78,7 +77,7 @@ public class CaiLowHeightRiskController extends BaseController { @Log(title = "高风险用户记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiLowHeightRisk bo) { + public R edit(@Validated(EditGroup.class) @RequestBody LowHeightRisk bo) { return toAjax(lowHeightRiskService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java index ff8c4a78..278e4e49 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiReportCate; +import com.ruoyi.cai.domain.ReportCate; import com.ruoyi.cai.service.CaiReportCateService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiReportCateController extends BaseController { */ @SaCheckPermission("cai:reportCate:list") @GetMapping("/list") - public TableDataInfo list(CaiReportCate bo, PageQuery pageQuery) { - Page page = caiReportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(ReportCate bo, PageQuery pageQuery) { + Page page = caiReportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -54,7 +54,7 @@ public class CaiReportCateController extends BaseController { */ @SaCheckPermission("cai:reportCate:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(caiReportCateService.getById(id)); } @@ -66,7 +66,7 @@ public class CaiReportCateController extends BaseController { @Log(title = "举报分类", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiReportCate bo) { + public R add(@Validated(AddGroup.class) @RequestBody ReportCate bo) { return toAjax(caiReportCateService.save(bo)); } @@ -77,7 +77,7 @@ public class CaiReportCateController extends BaseController { @Log(title = "举报分类", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiReportCate bo) { + public R edit(@Validated(EditGroup.class) @RequestBody ReportCate bo) { return toAjax(caiReportCateService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java index 7605a2b7..3684f9d8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiReport; +import com.ruoyi.cai.domain.Report; import com.ruoyi.cai.service.CaiReportService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiReportController extends BaseController { */ @SaCheckPermission("cai:report:list") @GetMapping("/list") - public TableDataInfo list(CaiReport bo, PageQuery pageQuery) { - Page page = caiReportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(Report bo, PageQuery pageQuery) { + Page page = caiReportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiReportController extends BaseController { */ @SaCheckPermission("cai:report:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiReportService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiReportController extends BaseController { @Log(title = "举报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiReport bo) { + public R add(@Validated(AddGroup.class) @RequestBody Report bo) { return toAjax(caiReportService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiReportController extends BaseController { @Log(title = "举报", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiReport bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Report bo) { return toAjax(caiReportService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java index 5e1c5870..3cfe84d4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java @@ -1,10 +1,9 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUnion; -import com.ruoyi.cai.dto.admin.vo.CaiUnionAdminVo; +import com.ruoyi.cai.domain.Union; +import com.ruoyi.cai.dto.admin.vo.UnionAdminVo; import com.ruoyi.cai.service.CaiUnionService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -42,8 +41,8 @@ public class CaiUnionController extends BaseController { */ @SaCheckPermission("cai:userUnion:list") @GetMapping("/list") - public TableDataInfo list(CaiUnionAdminVo bo, PageQuery pageQuery) { - Page page = caiUnionService.pageAdmin(pageQuery, bo); + public TableDataInfo list(UnionAdminVo bo, PageQuery pageQuery) { + Page page = caiUnionService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -55,7 +54,7 @@ public class CaiUnionController extends BaseController { */ @SaCheckPermission("cai:userUnion:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiUnionService.getById(id)); } @@ -67,7 +66,7 @@ public class CaiUnionController extends BaseController { @Log(title = "工会列表", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUnion bo) { + public R add(@Validated(AddGroup.class) @RequestBody Union bo) { return toAjax(caiUnionService.save(bo)); } @@ -78,7 +77,7 @@ public class CaiUnionController extends BaseController { @Log(title = "工会列表", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUnion bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Union bo) { return toAjax(caiUnionService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java index 6229b0c0..ae471a0c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUnionUser; +import com.ruoyi.cai.domain.UnionUser; import com.ruoyi.cai.service.CaiUnionUserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUnionUserController extends BaseController { */ @SaCheckPermission("cai:unionUser:list") @GetMapping("/list") - public TableDataInfo list(CaiUnionUser bo, PageQuery pageQuery) { - Page page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UnionUser bo, PageQuery pageQuery) { + Page page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiUnionUserController extends BaseController { */ @SaCheckPermission("cai:unionUser:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiUnionUserService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiUnionUserController extends BaseController { @Log(title = "123", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUnionUser bo) { + public R add(@Validated(AddGroup.class) @RequestBody UnionUser bo) { return toAjax(caiUnionUserService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiUnionUserController extends BaseController { @Log(title = "123", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUnionUser bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UnionUser bo) { return toAjax(caiUnionUserService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java index a752fea9..b558ff98 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserAlbum; +import com.ruoyi.cai.domain.UserAlbum; import com.ruoyi.cai.service.CaiUserAlbumService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserAlbumController extends BaseController { */ @SaCheckPermission("cai:userAlbum:list") @GetMapping("/list") - public TableDataInfo list(CaiUserAlbum bo, PageQuery pageQuery) { - Page page = userAlbumService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserAlbum bo, PageQuery pageQuery) { + Page page = userAlbumService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiUserAlbumController extends BaseController { */ @SaCheckPermission("cai:userAlbum:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(userAlbumService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiUserAlbumController extends BaseController { @Log(title = "主播集锦", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserAlbum bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserAlbum bo) { return toAjax(userAlbumService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiUserAlbumController extends BaseController { @Log(title = "主播集锦", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserAlbum bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserAlbum bo) { return toAjax(userAlbumService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java index dc4cce28..480a52dd 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.UserCall; import com.ruoyi.cai.service.CaiUserCallService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserCallController extends BaseController { */ @SaCheckPermission("cai:userCall:list") @GetMapping("/list") - public TableDataInfo list(CaiUserCall bo, PageQuery pageQuery) { - Page page = caiUserCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserCall bo, PageQuery pageQuery) { + Page page = caiUserCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiUserCallController extends BaseController { */ @SaCheckPermission("cai:userCall:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiUserCallService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiUserCallController extends BaseController { @Log(title = "通话记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserCall bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserCall bo) { return toAjax(caiUserCallService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiUserCallController extends BaseController { @Log(title = "通话记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserCall bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserCall bo) { return toAjax(caiUserCallService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java index 358a0a20..4b1a1391 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserCameraAudit; +import com.ruoyi.cai.domain.UserCameraAudit; import com.ruoyi.cai.service.CaiUserCameraAuditService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserCameraAuditController extends BaseController { */ @SaCheckPermission("cai:userCameraAudit:list") @GetMapping("/list") - public TableDataInfo list(CaiUserCameraAudit bo, PageQuery pageQuery) { - Page page = caiUserCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserCameraAudit bo, PageQuery pageQuery) { + Page page = caiUserCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiUserCameraAuditController extends BaseController { */ @SaCheckPermission("cai:userCameraAudit:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(caiUserCameraAuditService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiUserCameraAuditController extends BaseController { @Log(title = "自拍认证", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserCameraAudit bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserCameraAudit bo) { return toAjax(caiUserCameraAuditService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiUserCameraAuditController extends BaseController { @Log(title = "自拍认证", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserCameraAudit bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserCameraAudit bo) { return toAjax(caiUserCameraAuditService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java index 207a5c1f..bd6e5781 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java @@ -1,10 +1,9 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.dto.admin.vo.UserAdminVo; import com.ruoyi.cai.service.CaiUserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -42,8 +41,8 @@ public class CaiUserController extends BaseController { */ @SaCheckPermission("cai:user:list") @GetMapping("/list") - public TableDataInfo list(CaiUser query, PageQuery pageQuery) { - Page result = caiUserService.pageAdmin(pageQuery, query); + public TableDataInfo list(User query, PageQuery pageQuery) { + Page result = caiUserService.pageAdmin(pageQuery, query); return TableDataInfo.build(result); } @@ -54,7 +53,7 @@ public class CaiUserController extends BaseController { */ @SaCheckPermission("cai:user:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(caiUserService.getById(id)); } @@ -65,7 +64,7 @@ public class CaiUserController extends BaseController { @Log(title = "用户", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUser bo) { + public R add(@Validated(AddGroup.class) @RequestBody User bo) { return toAjax(caiUserService.save(bo)); } @@ -76,7 +75,7 @@ public class CaiUserController extends BaseController { @Log(title = "用户", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUser bo) { + public R edit(@Validated(EditGroup.class) @RequestBody User bo) { return toAjax(caiUserService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java index 933d20ef..b06318b5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserCount; +import com.ruoyi.cai.domain.UserCount; import com.ruoyi.cai.service.CaiUserCountService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserCountController extends BaseController { */ @SaCheckPermission("cai:userCount:list") @GetMapping("/list") - public TableDataInfo list(CaiUserCount bo, PageQuery pageQuery) { - Page page = caiUserCountService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserCount bo, PageQuery pageQuery) { + Page page = caiUserCountService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -54,7 +54,7 @@ public class CaiUserCountController extends BaseController { */ @SaCheckPermission("cai:userCount:query") @GetMapping("/{userId}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer userId) { return R.ok(caiUserCountService.getById(userId)); } @@ -66,7 +66,7 @@ public class CaiUserCountController extends BaseController { @Log(title = "用户信息数量统计", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserCount bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserCount bo) { return toAjax(caiUserCountService.save(bo)); } @@ -77,7 +77,7 @@ public class CaiUserCountController extends BaseController { @Log(title = "用户信息数量统计", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserCount bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserCount bo) { return toAjax(caiUserCountService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java index e674ca96..31839024 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserForbid; +import com.ruoyi.cai.domain.UserForbid; import com.ruoyi.cai.service.CaiUserForbidService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserForbidController extends BaseController { */ @SaCheckPermission("cai:userForbid:list") @GetMapping("/list") - public TableDataInfo list(CaiUserForbid bo, PageQuery pageQuery) { - Page page = userForbidService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserForbid bo, PageQuery pageQuery) { + Page page = userForbidService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiUserForbidController extends BaseController { */ @SaCheckPermission("cai:userForbid:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(userForbidService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiUserForbidController extends BaseController { @Log(title = "封号列表", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserForbid bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserForbid bo) { return toAjax(userForbidService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiUserForbidController extends BaseController { @Log(title = "封号列表", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserForbid bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserForbid bo) { return toAjax(userForbidService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java index 1750099e..be8cf4dc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserInvite; +import com.ruoyi.cai.domain.UserInvite; import com.ruoyi.cai.service.CaiUserInviteService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserInviteController extends BaseController { */ @SaCheckPermission("cai:userInvite:list") @GetMapping("/list") - public TableDataInfo list(CaiUserInvite bo, PageQuery pageQuery) { - Page page = caiUserInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserInvite bo, PageQuery pageQuery) { + Page page = caiUserInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiUserInviteController extends BaseController { */ @SaCheckPermission("cai:userInvite:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiUserInviteService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiUserInviteController extends BaseController { @Log(title = "用户邀请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserInvite bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserInvite bo) { return toAjax(caiUserInviteService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiUserInviteController extends BaseController { @Log(title = "用户邀请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserInvite bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserInvite bo) { return toAjax(caiUserInviteService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java index af6177c0..858bd6cb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java @@ -1,10 +1,9 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserMember; -import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; +import com.ruoyi.cai.domain.UserMember; +import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo; import com.ruoyi.cai.service.CaiUserMemberService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -42,8 +41,8 @@ public class CaiUserMemberController extends BaseController { */ @SaCheckPermission("cai:userMember:list") @GetMapping("/list") - public TableDataInfo list(CaiUserMemberAdminVo bo, PageQuery pageQuery) { - Page page = userMemberService.pageAdmin(pageQuery, bo); + public TableDataInfo list(UserMemberAdminVo bo, PageQuery pageQuery) { + Page page = userMemberService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -55,7 +54,7 @@ public class CaiUserMemberController extends BaseController { */ @SaCheckPermission("cai:userMember:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) { return R.ok(userMemberService.getById(id)); } @@ -67,7 +66,7 @@ public class CaiUserMemberController extends BaseController { @Log(title = "会员管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserMember bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserMember bo) { return toAjax(userMemberService.save(bo)); } @@ -78,7 +77,7 @@ public class CaiUserMemberController extends BaseController { @Log(title = "会员管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserMember bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserMember bo) { return toAjax(userMemberService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java index 51a7f5ee..25a867c3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserRiskLog; +import com.ruoyi.cai.domain.UserRiskLog; import com.ruoyi.cai.service.CaiUserRiskLogService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserRiskLogController extends BaseController { */ @SaCheckPermission("cai:userRiskLog:list") @GetMapping("/list") - public TableDataInfo list(CaiUserRiskLog bo, PageQuery pageQuery) { - Page page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserRiskLog bo, PageQuery pageQuery) { + Page page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -54,7 +54,7 @@ public class CaiUserRiskLogController extends BaseController { */ @SaCheckPermission("cai:userRiskLog:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(userRiskLogService.getById(id)); } @@ -66,7 +66,7 @@ public class CaiUserRiskLogController extends BaseController { @Log(title = "高风险操作日志", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserRiskLog bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserRiskLog bo) { return toAjax(userRiskLogService.save(bo)); } @@ -77,7 +77,7 @@ public class CaiUserRiskLogController extends BaseController { @Log(title = "高风险操作日志", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserRiskLog bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserRiskLog bo) { return toAjax(userRiskLogService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java index 122aff06..0a7ad09d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiUserVisitor; +import com.ruoyi.cai.domain.UserVisitor; import com.ruoyi.cai.service.CaiUserVisitorService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiUserVisitorController extends BaseController { */ @SaCheckPermission("cai:userVisitor:list") @GetMapping("/list") - public TableDataInfo list(CaiUserVisitor bo, PageQuery pageQuery) { - Page page = caiUserVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserVisitor bo, PageQuery pageQuery) { + Page page = caiUserVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiUserVisitorController extends BaseController { */ @SaCheckPermission("cai:userVisitor:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiUserVisitorService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiUserVisitorController extends BaseController { @Log(title = "用户来访记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiUserVisitor bo) { + public R add(@Validated(AddGroup.class) @RequestBody UserVisitor bo) { return toAjax(caiUserVisitorService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiUserVisitorController extends BaseController { @Log(title = "用户来访记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiUserVisitor bo) { + public R edit(@Validated(EditGroup.class) @RequestBody UserVisitor bo) { return toAjax(caiUserVisitorService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java index f7f6b6c7..8e8ebc9a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiWithdrawExchange; +import com.ruoyi.cai.domain.WithdrawExchange; import com.ruoyi.cai.service.CaiWithdrawExchangeService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class CaiWithdrawExchangeController extends BaseController { */ @SaCheckPermission("cai:withdrawExchange:list") @GetMapping("/list") - public TableDataInfo list(CaiWithdrawExchange bo, PageQuery pageQuery) { - Page page = caiWithdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(WithdrawExchange bo, PageQuery pageQuery) { + Page page = caiWithdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class CaiWithdrawExchangeController extends BaseController { */ @SaCheckPermission("cai:withdrawExchange:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(caiWithdrawExchangeService.getById(id)); } @@ -65,7 +65,7 @@ public class CaiWithdrawExchangeController extends BaseController { @Log(title = "提现 - 兑换配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiWithdrawExchange bo) { + public R add(@Validated(AddGroup.class) @RequestBody WithdrawExchange bo) { return toAjax(caiWithdrawExchangeService.save(bo)); } @@ -76,7 +76,7 @@ public class CaiWithdrawExchangeController extends BaseController { @Log(title = "提现 - 兑换配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiWithdrawExchange bo) { + public R edit(@Validated(EditGroup.class) @RequestBody WithdrawExchange bo) { return toAjax(caiWithdrawExchangeService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java index a336b692..d6f33834 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiBanner; +import com.ruoyi.cai.domain.Banner; import com.ruoyi.cai.dto.app.query.AnchorListQuery; import com.ruoyi.cai.dto.app.query.UserQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; @@ -44,7 +44,7 @@ public class IndexController { @GetMapping("/banner") @Operation(summary = "获取首页banner图") public R> banner(){ - List res = bannerService.index(); + List res = bannerService.index(); return R.ok(BeanConvertUtil.convertListTo(res, IndexBannerVo::new)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java index 5857cd2a..93ec6044 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java @@ -34,25 +34,25 @@ public class SettingAppController { @GetMapping("/goods") @Operation(summary = "充值配置") - public R> goods(){ - List list = goodsService.list(Wrappers.lambdaQuery(CaiGoods.class) - .eq(CaiGoods::getStatus,0) - .orderByAsc(CaiGoods::getPrice)); + public R> goods(){ + List list = goodsService.list(Wrappers.lambdaQuery(Goods.class) + .eq(Goods::getStatus,0) + .orderByAsc(Goods::getPrice)); return R.ok(list); } @GetMapping("/withdraw") @Operation(summary = "提现配置") - public R> withdraw(){ - List list = withdrawExchangeService.list(Wrappers.lambdaQuery(CaiWithdrawExchange.class) - .orderByAsc(CaiWithdrawExchange::getMoney)); + public R> withdraw(){ + List list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class) + .orderByAsc(WithdrawExchange::getMoney)); return R.ok(list); } @GetMapping("/report") @Operation(summary = "举报分类配置") - public R> report(){ - List list = reportCateService.list(Wrappers.lambdaQuery(CaiReportCate.class)); + public R> report(){ + List list = reportCateService.list(Wrappers.lambdaQuery(ReportCate.class)); return R.ok(list); } @@ -66,7 +66,7 @@ public class SettingAppController { @GetMapping("/gift") @Operation(summary = "礼物配置") public R> gift(){ - List res = giftService.all(); + List res = giftService.all(); return R.ok(BeanConvertUtil.convertListTo(res, GiftVo::new)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java index c1a897b5..73606ccf 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java @@ -2,9 +2,9 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAccountBankcard; -import com.ruoyi.cai.domain.CaiAccountCash; -import com.ruoyi.cai.domain.CaiAccountRecharge; +import com.ruoyi.cai.domain.AccountBankcard; +import com.ruoyi.cai.domain.AccountCash; +import com.ruoyi.cai.domain.AccountRecharge; import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes; import com.ruoyi.cai.dto.app.query.WithdrawReq; import com.ruoyi.cai.dto.app.vo.AccountCashVo; @@ -42,8 +42,8 @@ public class WalletController { @GetMapping("/aliInfo") @Operation(summary = "获取绑定支付宝信息") - public R aliInfo(){ - CaiAccountBankcard accountBankcard = currentUserManager.aliInfo(); + public R aliInfo(){ + AccountBankcard accountBankcard = currentUserManager.aliInfo(); return R.ok(accountBankcard); } @@ -66,9 +66,9 @@ public class WalletController { @Operation(summary = "充值记录-分页") public TableDataInfo rechargeLog(PageQuery query){ Long userId = LoginHelper.getUserId(); - Page page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(CaiAccountRecharge.class) - .eq(CaiAccountRecharge::getUserId, userId) - .orderByDesc(CaiAccountRecharge::getCreateTime)); + Page page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(AccountRecharge.class) + .eq(AccountRecharge::getUserId, userId) + .orderByDesc(AccountRecharge::getCreateTime)); return TableDataInfo.build(page,AccountRechargeVo::new); } @@ -76,9 +76,9 @@ public class WalletController { @Operation(summary = "提现记录-分页") public TableDataInfo cashLog(PageQuery query){ Long userId = LoginHelper.getUserId(); - Page page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class) - .eq(CaiAccountCash::getUserId, userId) - .orderByDesc(CaiAccountCash::getCreateTime)); + Page page = accountCashService.page(query.build(), Wrappers.lambdaQuery(AccountCash.class) + .eq(AccountCash::getUserId, userId) + .orderByDesc(AccountCash::getCreateTime)); return TableDataInfo.build(page,AccountCashVo::new); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Account.java similarity index 83% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Account.java index 15cdf048..297867b3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Account.java @@ -2,15 +2,11 @@ package com.ruoyi.cai.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import lombok.EqualsAndHashCode; + import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; import java.math.BigDecimal; -import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; - /** * 用户账户对象 cai_account * @@ -19,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity; */ @Data @TableName("cai_account") -public class CaiAccount implements Serializable { +public class Account implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountBankcard.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBankcard.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountBankcard.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBankcard.java index eecc5f3b..9b4d4478 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountBankcard.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBankcard.java @@ -16,7 +16,7 @@ import java.io.Serializable; @Data @TableName("cai_account_bankcard") @Schema(description = "用户银行卡对象") -public class CaiAccountBankcard implements Serializable { +public class AccountBankcard implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountBusiness.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBusiness.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountBusiness.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBusiness.java index 7d1ef630..83fb7771 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountBusiness.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBusiness.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_account_business") -public class CaiAccountBusiness implements Serializable { +public class AccountBusiness implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountCash.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountCash.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java index 7f57581b..06421799 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountCash.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_account_cash") -public class CaiAccountCash implements Serializable { +public class AccountCash implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountDetail.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountDetail.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountDetail.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountDetail.java index e080c5fb..0168923e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountDetail.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountDetail.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_account_detail") -public class CaiAccountDetail implements Serializable { +public class AccountDetail implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountRecharge.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountRecharge.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountRecharge.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountRecharge.java index ae789c74..c98bb2e1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccountRecharge.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountRecharge.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_account_recharge") -public class CaiAccountRecharge implements Serializable { +public class AccountRecharge implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAnchor.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Anchor.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAnchor.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Anchor.java index add9d689..964727ef 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAnchor.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Anchor.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_anchor") -public class CaiAnchor implements Serializable{ +public class Anchor implements Serializable{ private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAnchorApply.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AnchorApply.java similarity index 92% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAnchorApply.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AnchorApply.java index 0c2674e8..9c843429 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAnchorApply.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AnchorApply.java @@ -6,7 +6,6 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; /** * 播主申请管理对象 cai_anchor_apply @@ -16,7 +15,7 @@ import java.util.Date; */ @Data @TableName("cai_anchor_apply") -public class CaiAnchorApply implements Serializable { +public class AnchorApply implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiArea.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Area.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiArea.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Area.java index 8593c4ef..dd168a3c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiArea.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Area.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ @Data @TableName("cai_area") -public class CaiArea implements Serializable { +public class Area implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiBanner.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Banner.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiBanner.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Banner.java index c87fe546..7628fffc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiBanner.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Banner.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_banner") -public class CaiBanner implements Serializable { +public class Banner implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java index 6b972099..87315cc7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java @@ -158,7 +158,7 @@ public class CaiConsumeLog implements Serializable { private LocalDateTime createTime; - public void init(CaiUser fromUser,CaiUser toUser){ + public void init(User fromUser, User toUser){ this.setSourceUserId(fromUser.getId()); this.setSourcePhone(fromUser.getMobile()); this.setSourceUsercode(fromUser.getUsercode()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiCitys.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Citys.java similarity index 92% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiCitys.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Citys.java index c21302ba..a25c2cb6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiCitys.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Citys.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ @Data @TableName("cai_citys") -public class CaiCitys implements Serializable { +public class Citys implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiDynamic.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiDynamic.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java index d72138fd..56cbf2b7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiDynamic.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_dynamic") -public class CaiDynamic implements Serializable { +public class Dynamic implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiDynamicImages.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/DynamicImages.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiDynamicImages.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/DynamicImages.java index 783abdc6..e1a57ad3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiDynamicImages.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/DynamicImages.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_dynamic_images") -public class CaiDynamicImages implements Serializable { +public class DynamicImages implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGift.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGift.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java index e76f1064..4a9ab163 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGift.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ @Data @TableName("cai_gift") -public class CaiGift implements Serializable { +public class Gift implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGiveLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GiveLog.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGiveLog.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GiveLog.java index d30604e2..4237123e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGiveLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GiveLog.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_give_log") -public class CaiGiveLog implements Serializable { +public class GiveLog implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGoods.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Goods.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGoods.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Goods.java index 95860023..724445c4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGoods.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Goods.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; */ @Data @TableName("cai_goods") -public class CaiGoods implements Serializable { +public class Goods implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardLog.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java index 8e65adb3..00b6a5a4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_guard_log") -public class CaiGuardLog implements Serializable { +public class GuardLog implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardTotal.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardTotal.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java index fa89e703..8e4a4378 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiGuardTotal.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_guard_total") -public class CaiGuardTotal implements Serializable { +public class GuardTotal implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiLowHeightRisk.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LowHeightRisk.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiLowHeightRisk.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LowHeightRisk.java index 8e37a6bf..07e0123d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiLowHeightRisk.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LowHeightRisk.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_low_height_risk") -public class CaiLowHeightRisk implements Serializable { +public class LowHeightRisk implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiMemberSkill.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiMemberSkill.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java index cbb47ea0..9d6c7a94 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiMemberSkill.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ @Data @TableName("cai_member_skill") -public class CaiMemberSkill implements Serializable { +public class MemberSkill implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiReport.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Report.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiReport.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Report.java index 6b216a5b..e7d161f8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiReport.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Report.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_report") -public class CaiReport implements Serializable { +public class Report implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiReportCate.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/ReportCate.java similarity index 92% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiReportCate.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/ReportCate.java index 9f2595b7..f5b6c553 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiReportCate.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/ReportCate.java @@ -15,7 +15,7 @@ import java.io.Serializable; */ @Data @TableName("cai_report_cate") -public class CaiReportCate implements Serializable { +public class ReportCate implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnion.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Union.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnion.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Union.java index 3d584214..e94c79d5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnion.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Union.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_union") -public class CaiUnion implements Serializable { +public class Union implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnionUser.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UnionUser.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnionUser.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UnionUser.java index 4c3a7b1e..ab370eca 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnionUser.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UnionUser.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_union_user") -public class CaiUnionUser implements Serializable { +public class UnionUser implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUser.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUser.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java index 63f89692..d61be6e1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUser.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user") -public class CaiUser implements Serializable { +public class User implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserAlbum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserAlbum.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java index 0887352e..20269e91 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserAlbum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_album") -public class CaiUserAlbum implements Serializable { +public class UserAlbum implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserBlacklist.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserBlacklist.java similarity index 91% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserBlacklist.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserBlacklist.java index dd314894..583ee0d2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserBlacklist.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserBlacklist.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_blacklist") -public class CaiUserBlacklist implements Serializable { +public class UserBlacklist implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCall.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCall.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java index 08def435..7d639f32 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCall.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_call") -public class CaiUserCall implements Serializable { +public class UserCall implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCameraAudit.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCameraAudit.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCameraAudit.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCameraAudit.java index 824a1e0e..5900d118 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCameraAudit.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCameraAudit.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ @Data @TableName("cai_user_camera_audit") -public class CaiUserCameraAudit implements Serializable { +public class UserCameraAudit implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCodeGen.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCodeGen.java similarity index 88% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCodeGen.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCodeGen.java index e00e8d81..deb55dee 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCodeGen.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCodeGen.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ @Data @TableName("cai_user_code_gen") -public class CaiUserCodeGen implements Serializable { +public class UserCodeGen implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCount.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCount.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCount.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCount.java index 3a3bcb66..773c44ef 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserCount.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCount.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_count") -public class CaiUserCount implements Serializable { +public class UserCount implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollow.java similarity index 78% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollow.java index d8b02451..2e18b1a1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollow.java @@ -2,13 +2,9 @@ package com.ruoyi.cai.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import lombok.EqualsAndHashCode; + import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; -import java.math.BigDecimal; - -import com.ruoyi.common.core.domain.BaseEntity; /** * 关注表对象 cai_user_follow @@ -18,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity; */ @Data @TableName("cai_user_follow") -public class CaiUserFollow implements Serializable { +public class UserFollow implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollowDynamic.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollowDynamic.java similarity index 90% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollowDynamic.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollowDynamic.java index 6747bbbe..39f01286 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollowDynamic.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollowDynamic.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_follow_dynamic") -public class CaiUserFollowDynamic implements Serializable { +public class UserFollowDynamic implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserForbid.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserForbid.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserForbid.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserForbid.java index 73b9e449..e0f020e1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserForbid.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserForbid.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_forbid") -public class CaiUserForbid implements Serializable { +public class UserForbid implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserGift.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserGift.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java index c097f5d2..c3b01a77 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserGift.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_gift") -public class CaiUserGift implements Serializable { +public class UserGift implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserInfo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java similarity index 87% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserInfo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java index 1f390e62..6cd02ef2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserInfo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java @@ -2,14 +2,9 @@ package com.ruoyi.cai.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; -import java.math.BigDecimal; +import java.time.LocalDateTime; import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; /** * 用户信息对象 cai_user_info @@ -19,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity; */ @Data @TableName("cai_user_info") -public class CaiUserInfo { +public class UserInfo { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserInvite.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInvite.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserInvite.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInvite.java index ea5b9da8..9f9eac4d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserInvite.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInvite.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_invite") -public class CaiUserInvite implements Serializable { +public class UserInvite implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserMember.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserMember.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserMember.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserMember.java index c5b81307..0c55d0ab 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserMember.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserMember.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_member") -public class CaiUserMember implements Serializable { +public class UserMember implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserOnline.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserOnline.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserOnline.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserOnline.java index 669604f5..d2c2d583 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserOnline.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserOnline.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_online") -public class CaiUserOnline implements Serializable { +public class UserOnline implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserRiskLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserRiskLog.java similarity index 92% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserRiskLog.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserRiskLog.java index f5dcdf95..c1e22d04 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserRiskLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserRiskLog.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_risk_log") -public class CaiUserRiskLog implements Serializable { +public class UserRiskLog implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserVisitor.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserVisitor.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserVisitor.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserVisitor.java index aea73005..13241526 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserVisitor.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserVisitor.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_user_visitor") -public class CaiUserVisitor implements Serializable { +public class UserVisitor implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiWithdrawExchange.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java similarity index 92% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiWithdrawExchange.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java index 1b3cd55b..a6c2872d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiWithdrawExchange.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java @@ -15,7 +15,7 @@ import java.io.Serializable; */ @Data @TableName("cai_withdraw_exchange") -public class CaiWithdrawExchange implements Serializable { +public class WithdrawExchange implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java similarity index 83% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorAdminVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java index 2cfcb02f..38a03896 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java @@ -1,10 +1,10 @@ package com.ruoyi.cai.dto.admin.vo; -import com.ruoyi.cai.domain.CaiAnchor; +import com.ruoyi.cai.domain.Anchor; import lombok.Data; @Data -public class CaiAnchorAdminVo extends CaiAnchor { +public class AnchorAdminVo extends Anchor { /** * 用户号/ID号 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorApplyAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java similarity index 74% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorApplyAdminVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java index 6aad0a8e..a7474067 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorApplyAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java @@ -1,12 +1,12 @@ package com.ruoyi.cai.dto.admin.vo; -import com.ruoyi.cai.domain.CaiAnchorApply; +import com.ruoyi.cai.domain.AnchorApply; import lombok.Data; import java.io.Serializable; @Data -public class CaiAnchorApplyAdminVo extends CaiAnchorApply implements Serializable { +public class AnchorApplyAdminVo extends AnchorApply implements Serializable { /** * 用户号/ID号 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiLowHeightRiskAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java similarity index 78% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiLowHeightRiskAdminVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java index ff527d2a..f084c38b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiLowHeightRiskAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java @@ -1,10 +1,10 @@ package com.ruoyi.cai.dto.admin.vo; -import com.ruoyi.cai.domain.CaiLowHeightRisk; +import com.ruoyi.cai.domain.LowHeightRisk; import lombok.Data; @Data -public class CaiLowHeightRiskAdminVo extends CaiLowHeightRisk { +public class LowHeightRiskAdminVo extends LowHeightRisk { /** * 用户号/ID号 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUnionAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java similarity index 86% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUnionAdminVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java index 395279cd..72f2abf7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUnionAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java @@ -1,6 +1,6 @@ package com.ruoyi.cai.dto.admin.vo; -import com.ruoyi.cai.domain.CaiUnion; +import com.ruoyi.cai.domain.Union; import lombok.Data; import lombok.EqualsAndHashCode; @@ -8,7 +8,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) @Data -public class CaiUnionAdminVo extends CaiUnion { +public class UnionAdminVo extends Union { /** * 用户号/ID号 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java similarity index 82% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserAdminVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java index 8879aa1f..7da14c65 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java @@ -1,12 +1,12 @@ package com.ruoyi.cai.dto.admin.vo; -import com.ruoyi.cai.domain.CaiUser; +import com.ruoyi.cai.domain.User; import lombok.Data; import java.time.LocalDateTime; @Data -public class CaiUserAdminVo extends CaiUser { +public class UserAdminVo extends User { /** * 最后登录IP */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java new file mode 100644 index 00000000..de90bf0b --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java @@ -0,0 +1,30 @@ +package com.ruoyi.cai.dto.admin.vo; + +import com.ruoyi.cai.domain.UserCount; +import lombok.Data; + +@Data +public class UserCountAdminVo extends UserCount { + /** + * 用户号/ID号 + */ + private String usercode; + /** + * 昵称 + */ + private String nickname; + + /** + * 手机号 + */ + private String mobile; + + /** + * 头像 + */ + private String avatar; + /** + * 性别 + */ + private Integer gender; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserMemberAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java similarity index 82% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserMemberAdminVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java index 3f4ab133..2a86f643 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserMemberAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java @@ -1,12 +1,12 @@ package com.ruoyi.cai.dto.admin.vo; -import com.ruoyi.cai.domain.CaiUserMember; +import com.ruoyi.cai.domain.UserMember; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -public class CaiUserMemberAdminVo extends CaiUserMember { +public class UserMemberAdminVo extends UserMember { /** * 用户号/ID号 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index 31468c2b..c587b5af 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -36,46 +36,46 @@ public class CurrentUserManager { public CurrentUserInfoVo currentInfo() { Long userId = LoginHelper.getUserId(); - CaiUser user = userService.getById(userId); + User user = userService.getById(userId); CurrentUserInfoVo res = BeanConvertUtil.convertTo(user, CurrentUserInfoVo::new); - CaiAnchor anchor = anchorService.getByUserId(userId); + Anchor anchor = anchorService.getByUserId(userId); res.setOpenVideoStatus(anchor.getOpenVideoStatus()); - CaiUserCount userCount = userCountService.getByUserId(userId); + UserCount userCount = userCountService.getByUserId(userId); res.setUserCount(BeanConvertUtil.convertTo(userCount, UserCountVo::new)); - CaiAccount account = accountService.getByUserId(userId); + Account account = accountService.getByUserId(userId); res.setUserAccount(BeanConvertUtil.convertTo(account, UserAccountVo::new)); - List userAlbums = userAlbumService.listByUserId(userId); + List userAlbums = userAlbumService.listByUserId(userId); res.setUserAlbumList(BeanConvertUtil.convertListTo(userAlbums, UserAlbumDTO::new)); return res; } public UserAccountVo currentAccount(){ Long userId = LoginHelper.getUserId(); - CaiAccount account = accountService.getByUserId(userId); + Account account = accountService.getByUserId(userId); return BeanConvertUtil.convertTo(account,UserAccountVo::new); } public AnchorVo anchorInfo() { Long userId = LoginHelper.getUserId(); - CaiAnchor anchor = anchorService.getByUserId(userId); + Anchor anchor = anchorService.getByUserId(userId); return BeanConvertUtil.convertTo(anchor,AnchorVo::new); } public boolean anchorUpdate(AnchorUpdateReq anchorUpdate) { anchorUpdate.setUserId(LoginHelper.getUserId()); boolean updateFlag = false; - LambdaUpdateWrapper update = - Wrappers.lambdaUpdate(CaiAnchor.class).eq(CaiAnchor::getUserId, anchorUpdate.getUserId()); + LambdaUpdateWrapper update = + Wrappers.lambdaUpdate(Anchor.class).eq(Anchor::getUserId, anchorUpdate.getUserId()); if(anchorUpdate.getPrice() != null){ - update.set(CaiAnchor::getPrice,anchorUpdate.getPrice()); + update.set(Anchor::getPrice,anchorUpdate.getPrice()); updateFlag=true; } if(anchorUpdate.getOrderSwitch() != null){ - update.set(CaiAnchor::getOrderSwitch,anchorUpdate.getOrderSwitch()); + update.set(Anchor::getOrderSwitch,anchorUpdate.getOrderSwitch()); updateFlag=true; } if(anchorUpdate.getOpenVideoStatus() != null){ - update.set(CaiAnchor::getOpenVideoStatus,anchorUpdate.getOpenVideoStatus()); + update.set(Anchor::getOpenVideoStatus,anchorUpdate.getOpenVideoStatus()); updateFlag=true; } if(updateFlag){ @@ -87,23 +87,23 @@ public class CurrentUserManager { public boolean userUpdate(UserUpdateReq res) { res.setUserId(LoginHelper.getUserId()); boolean updateFlag = false; - LambdaUpdateWrapper update = - Wrappers.lambdaUpdate(CaiUser.class).eq(CaiUser::getId, res.getUserId()); + LambdaUpdateWrapper update = + Wrappers.lambdaUpdate(User.class).eq(User::getId, res.getUserId()); if(StringUtils.isNotEmpty(res.getNickname())){ - update.set(CaiUser::getNickname,res.getNickname()); + update.set(User::getNickname,res.getNickname()); updateFlag=true; } if(res.getBirthday() != null){ - update.set(CaiUser::getBirthday,res.getBirthday()); + update.set(User::getBirthday,res.getBirthday()); updateFlag=true; } if(res.getCity() != null){ - update.set(CaiUser::getCity,res.getCity()); + update.set(User::getCity,res.getCity()); updateFlag=true; } if(StringUtils.isNotEmpty(res.getAvatar())){ - update.set(CaiUser::getAvatar,res.getAvatar()); - update.set(CaiUser::getAvatarState,1); + update.set(User::getAvatar,res.getAvatar()); + update.set(User::getAvatarState,1); updateFlag=true; } if(updateFlag){ @@ -115,14 +115,14 @@ public class CurrentUserManager { return true; } - public CaiAccountBankcard aliInfo() { - return accountBankcardService.getOne(Wrappers.lambdaQuery(CaiAccountBankcard.class) - .eq(CaiAccountBankcard::getUserId, LoginHelper.getUserId()) + public AccountBankcard aliInfo() { + return accountBankcardService.getOne(Wrappers.lambdaQuery(AccountBankcard.class) + .eq(AccountBankcard::getUserId, LoginHelper.getUserId()) .last("limit 1")); } public void saveOrUpdateAliInfo(AccountAliBankCardRes res) { - CaiAccountBankcard bankcard = new CaiAccountBankcard(); + AccountBankcard bankcard = new AccountBankcard(); bankcard.setId(res.getId()); if(bankcard.getId() == null){ bankcard.setType(1); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java index 708dcdba..7277344c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiAccountBankcard; +import com.ruoyi.cai.domain.AccountBankcard; /** * 用户银行卡Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountBankcard; * @author 77 * @date 2023-12-21 */ -public interface CaiAccountBankcardMapper extends BaseMapper { +public interface CaiAccountBankcardMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java index 582a38e4..a3c2965d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiAccountBusiness; +import com.ruoyi.cai.domain.AccountBusiness; /** * 账户业务Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountBusiness; * @author 77 * @date 2023-12-22 */ -public interface CaiAccountBusinessMapper extends BaseMapper { +public interface CaiAccountBusinessMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java index 0af4a92d..716d2b57 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiAccountCash; +import com.ruoyi.cai.domain.AccountCash; /** * 用户提现记录Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountCash; * @author 77 * @date 2023-12-21 */ -public interface CaiAccountCashMapper extends BaseMapper { +public interface CaiAccountCashMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java index 8a767ba7..45bcddd6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiAccountDetail; +import com.ruoyi.cai.domain.AccountDetail; /** * 账户明细Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountDetail; * @author 77 * @date 2023-12-22 */ -public interface CaiAccountDetailMapper extends BaseMapper { +public interface CaiAccountDetailMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java index 0f84bfac..e22af44e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiAccount; +import com.ruoyi.cai.domain.Account; import org.apache.ibatis.annotations.Param; /** @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-23 */ -public interface CaiAccountMapper extends BaseMapper { +public interface CaiAccountMapper extends BaseMapper { long decrCoin(@Param("userId") Long userId, @Param("coin") Long coin); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java index cfa4aec6..d473a07e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiAccountRecharge; +import com.ruoyi.cai.domain.AccountRecharge; /** * 充值记录Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountRecharge; * @author 77 * @date 2023-12-22 */ -public interface CaiAccountRechargeMapper extends BaseMapper { +public interface CaiAccountRechargeMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java index f77a7eae..b9abc191 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java @@ -2,8 +2,8 @@ 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.CaiAnchorApply; -import com.ruoyi.cai.dto.admin.vo.CaiAnchorApplyAdminVo; +import com.ruoyi.cai.domain.AnchorApply; +import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo; import org.apache.ibatis.annotations.Param; /** @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-22 */ -public interface CaiAnchorApplyMapper extends BaseMapper { +public interface CaiAnchorApplyMapper extends BaseMapper { - Page pageAdmin(@Param("build") Page build, @Param("bo") CaiAnchorApplyAdminVo bo); + Page pageAdmin(@Param("build") Page build, @Param("bo") AnchorApplyAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java index 0dbe7d4c..b7d943f1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java @@ -2,8 +2,8 @@ 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.CaiAnchor; -import com.ruoyi.cai.dto.admin.vo.CaiAnchorAdminVo; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo; import com.ruoyi.cai.dto.app.query.AnchorListQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import org.apache.ibatis.annotations.Param; @@ -14,9 +14,9 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-22 */ -public interface CaiAnchorMapper extends BaseMapper { +public interface CaiAnchorMapper extends BaseMapper { - Page pageAdmin(@Param("build") Page build, @Param("bo") CaiAnchorAdminVo bo); + Page pageAdmin(@Param("build") Page build, @Param("bo") AnchorAdminVo bo); Page pageApp(@Param("build") Page build, @Param("query") AnchorListQuery query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java index 71a341a6..42360fab 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiArea; +import com.ruoyi.cai.domain.Area; /** * 地区Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiArea; * @author 77 * @date 2023-12-23 */ -public interface CaiAreaMapper extends BaseMapper { +public interface CaiAreaMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java index 71af68d9..6c5d2be6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiBanner; +import com.ruoyi.cai.domain.Banner; /** * 轮播Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiBanner; * @author 77 * @date 2023-12-21 */ -public interface CaiBannerMapper extends BaseMapper { +public interface CaiBannerMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java index 6d304616..c586d868 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiCitys; +import com.ruoyi.cai.domain.Citys; /** * 城市Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiCitys; * @author 77 * @date 2023-12-30 */ -public interface CaiCitysMapper extends BaseMapper { +public interface CaiCitysMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java index d17fe950..e4c8eafe 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiDynamicImages; +import com.ruoyi.cai.domain.DynamicImages; /** * 附件Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiDynamicImages; * @author 77 * @date 2023-12-23 */ -public interface CaiDynamicImagesMapper extends BaseMapper { +public interface CaiDynamicImagesMapper extends BaseMapper { } 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 1cb306af..f8f54a97 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 @@ -2,7 +2,7 @@ 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.CaiDynamic; +import com.ruoyi.cai.domain.Dynamic; import com.ruoyi.cai.dto.app.query.DynamicQuery; import com.ruoyi.cai.dto.app.vo.DynamicListVo; import org.apache.ibatis.annotations.Param; @@ -15,7 +15,7 @@ import java.util.List; * @author 77 * @date 2023-12-23 */ -public interface CaiDynamicMapper extends BaseMapper { +public interface CaiDynamicMapper extends BaseMapper { Page pageApp(@Param("build") Page build, @Param("query") DynamicQuery query); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java index c2070bf8..7bbab791 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiGift; +import com.ruoyi.cai.domain.Gift; /** * 礼物Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGift; * @author 77 * @date 2023-12-23 */ -public interface CaiGiftMapper extends BaseMapper { +public interface CaiGiftMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java index 35b911c3..7119c1ee 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiGiveLog; +import com.ruoyi.cai.domain.GiveLog; /** * 赠送记录Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGiveLog; * @author 77 * @date 2023-12-24 */ -public interface CaiGiveLogMapper extends BaseMapper { +public interface CaiGiveLogMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGoodsMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGoodsMapper.java index 937c7ddd..487c05a2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGoodsMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGoodsMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiGoods; +import com.ruoyi.cai.domain.Goods; /** * 充值配置Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGoods; * @author 77 * @date 2023-12-24 */ -public interface CaiGoodsMapper extends BaseMapper { +public interface CaiGoodsMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java index 17c9fccb..52acb66b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiGuardLog; +import com.ruoyi.cai.domain.GuardLog; /** * 守护赠送流水Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGuardLog; * @author 77 * @date 2023-12-30 */ -public interface CaiGuardLogMapper extends BaseMapper { +public interface CaiGuardLogMapper extends BaseMapper { } 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 e7bc94a5..c79c953c 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 @@ -2,7 +2,7 @@ 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.domain.GuardTotal; import com.ruoyi.cai.dto.app.dto.GuardTotalDTO; import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo; import org.apache.ibatis.annotations.Param; @@ -15,7 +15,7 @@ import java.util.List; * @author 77 * @date 2023-12-23 */ -public interface CaiGuardTotalMapper extends BaseMapper { +public interface CaiGuardTotalMapper extends BaseMapper { List selectGuardTotal(@Param("fromUserId") Long fromUserId, @Param("limit") Integer limit); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java index c53092a0..1a4f8c84 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java @@ -2,8 +2,8 @@ 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.CaiLowHeightRisk; -import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo; +import com.ruoyi.cai.domain.LowHeightRisk; +import com.ruoyi.cai.dto.admin.vo.LowHeightRiskAdminVo; import org.apache.ibatis.annotations.Param; /** @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-22 */ -public interface CaiLowHeightRiskMapper extends BaseMapper { +public interface CaiLowHeightRiskMapper extends BaseMapper { - Page pageAdmin(@Param("build") Page build, @Param("bo") CaiLowHeightRiskAdminVo bo); + Page pageAdmin(@Param("build") Page build, @Param("bo") LowHeightRiskAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiMemberSkillMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiMemberSkillMapper.java index a8374dd1..70933d06 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiMemberSkillMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiMemberSkillMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiMemberSkill; +import com.ruoyi.cai.domain.MemberSkill; /** * 会员技能Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiMemberSkill; * @author 77 * @date 2023-12-30 */ -public interface CaiMemberSkillMapper extends BaseMapper { +public interface CaiMemberSkillMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportCateMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportCateMapper.java index c8524cb5..720089f5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportCateMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportCateMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiReportCate; +import com.ruoyi.cai.domain.ReportCate; /** * 举报分类Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiReportCate; * @author 77 * @date 2023-12-24 */ -public interface CaiReportCateMapper extends BaseMapper { +public interface CaiReportCateMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportMapper.java index 0c0297c0..ab70b37c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiReport; +import com.ruoyi.cai.domain.Report; /** * 举报Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiReport; * @author 77 * @date 2023-12-24 */ -public interface CaiReportMapper extends BaseMapper { +public interface CaiReportMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java index 7dcc8127..966fc33c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java @@ -2,8 +2,8 @@ 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.CaiUnion; -import com.ruoyi.cai.dto.admin.vo.CaiUnionAdminVo; +import com.ruoyi.cai.domain.Union; +import com.ruoyi.cai.dto.admin.vo.UnionAdminVo; import org.apache.ibatis.annotations.Param; /** @@ -12,8 +12,8 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-22 */ -public interface CaiUnionMapper extends BaseMapper { +public interface CaiUnionMapper extends BaseMapper { - Page pageAdmin(@Param("build") Page build, @Param("bo") CaiUnionAdminVo bo); + Page pageAdmin(@Param("build") Page build, @Param("bo") UnionAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java index 5230d9fe..43a8a1c8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUnionUser; +import com.ruoyi.cai.domain.UnionUser; /** * 123Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUnionUser; * @author ruoyi * @date 2023-12-22 */ -public interface CaiUnionUserMapper extends BaseMapper { +public interface CaiUnionUserMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserAlbumMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserAlbumMapper.java index 36133866..2269febb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserAlbumMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserAlbumMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserAlbum; +import com.ruoyi.cai.domain.UserAlbum; /** * 主播集锦Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserAlbum; * @author ruoyi * @date 2023-12-23 */ -public interface CaiUserAlbumMapper extends BaseMapper { +public interface CaiUserAlbumMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserBlacklistMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserBlacklistMapper.java index 7d1e9cf0..0b284491 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserBlacklistMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserBlacklistMapper.java @@ -2,7 +2,7 @@ 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.CaiUserBlacklist; +import com.ruoyi.cai.domain.UserBlacklist; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import org.apache.ibatis.annotations.Param; @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-30 */ -public interface CaiUserBlacklistMapper extends BaseMapper< CaiUserBlacklist> { +public interface CaiUserBlacklistMapper extends BaseMapper { Page pageApp(@Param("build") Page build, @Param("userId") Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCallMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCallMapper.java index f5a26382..4e6517ee 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCallMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCallMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.UserCall; /** * 通话记录Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserCall; * @author 77 * @date 2023-12-27 */ -public interface CaiUserCallMapper extends BaseMapper { +public interface CaiUserCallMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCameraAuditMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCameraAuditMapper.java index 9100add3..191542f3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCameraAuditMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCameraAuditMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserCameraAudit; +import com.ruoyi.cai.domain.UserCameraAudit; /** * 自拍认证Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserCameraAudit; * @author 77 * @date 2023-12-30 */ -public interface CaiUserCameraAuditMapper extends BaseMapper { +public interface CaiUserCameraAuditMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCodeGenMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCodeGenMapper.java index 34fbb985..93b77da8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCodeGenMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCodeGenMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserCodeGen; +import com.ruoyi.cai.domain.UserCodeGen; /** * idMapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserCodeGen; * @author 77 * @date 2023-12-21 */ -public interface CaiUserCodeGenMapper extends BaseMapper { +public interface CaiUserCodeGenMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCountMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCountMapper.java index 3aa38126..d70719ec 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCountMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCountMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserCount; +import com.ruoyi.cai.domain.UserCount; import org.apache.ibatis.annotations.Param; /** @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-24 */ -public interface CaiUserCountMapper extends BaseMapper { +public interface CaiUserCountMapper extends BaseMapper { void starIncs(@Param("userId") Long userId, @Param("fansIncs") int fansIncs, @Param("followIncs") int followIncs); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowDynamicMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowDynamicMapper.java index 3bfeb5ca..ca625401 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowDynamicMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowDynamicMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserFollowDynamic; +import com.ruoyi.cai.domain.UserFollowDynamic; /** * 关注动态表Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserFollowDynamic; * @author 77 * @date 2023-12-23 */ -public interface CaiUserFollowDynamicMapper extends BaseMapper { +public interface CaiUserFollowDynamicMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java index 4991be29..bae07ac4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java @@ -2,7 +2,7 @@ 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.CaiUserFollow; +import com.ruoyi.cai.domain.UserFollow; import com.ruoyi.cai.dto.app.query.StarQuery; import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-23 */ -public interface CaiUserFollowMapper extends BaseMapper { +public interface CaiUserFollowMapper extends BaseMapper { Page pageApp(@Param("build") Page build, @Param("query") StarQuery query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserForbidMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserForbidMapper.java index a24c143b..a447b296 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserForbidMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserForbidMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserForbid; +import com.ruoyi.cai.domain.UserForbid; /** * 封号列表Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserForbid; * @author 77 * @date 2023-12-21 */ -public interface CaiUserForbidMapper extends BaseMapper { +public interface CaiUserForbidMapper extends BaseMapper { } 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 c8609b3a..3fa26d68 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 @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserGift; +import com.ruoyi.cai.domain.UserGift; import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import java.util.List; * @author 77 * @date 2023-12-23 */ -public interface CaiUserGiftMapper extends BaseMapper { +public interface CaiUserGiftMapper extends BaseMapper { List selectGiftList(@Param("userId") Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInfoMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInfoMapper.java index 08275d3e..e9c972d7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInfoMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInfoMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserInfo; +import com.ruoyi.cai.domain.UserInfo; -public interface CaiUserInfoMapper extends BaseMapper { +public interface CaiUserInfoMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java index 4557b70f..2c2f93bc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java @@ -2,7 +2,7 @@ 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.CaiUserInvite; +import com.ruoyi.cai.domain.UserInvite; import com.ruoyi.cai.dto.app.dto.InviteCountDTO; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-28 */ -public interface CaiUserInviteMapper extends BaseMapper { +public interface CaiUserInviteMapper extends BaseMapper { InviteCountDTO countInviteAndReward(@Param("userId") Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java index 71419d13..991008ed 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java @@ -2,8 +2,8 @@ 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.CaiUser; -import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.dto.admin.vo.UserAdminVo; import com.ruoyi.cai.dto.app.query.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import org.apache.ibatis.annotations.Param; @@ -14,9 +14,9 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-19 */ -public interface CaiUserMapper extends BaseMapper { +public interface CaiUserMapper extends BaseMapper { - Page pageAdmin(@Param("build") Page build, @Param("query") CaiUser query); + Page pageAdmin(@Param("build") Page build, @Param("query") User query); Page pageApp(@Param("build") Page build, @Param("query") UserQuery query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java index f0e3639e..a573b444 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java @@ -2,8 +2,8 @@ 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.CaiUserMember; -import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; +import com.ruoyi.cai.domain.UserMember; +import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo; import org.apache.ibatis.annotations.Param; /** @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-21 */ -public interface CaiUserMemberMapper extends BaseMapper { +public interface CaiUserMemberMapper extends BaseMapper { - Page pageAdmin(@Param("build") Page build, @Param("bo") CaiUserMemberAdminVo bo); + Page pageAdmin(@Param("build") Page build, @Param("bo") UserMemberAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserOnlineMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserOnlineMapper.java index 279b9ece..b7ef6b4c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserOnlineMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserOnlineMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserOnline; +import com.ruoyi.cai.domain.UserOnline; /** * 用户在线状态Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserOnline; * @author 77 * @date 2023-12-23 */ -public interface CaiUserOnlineMapper extends BaseMapper { +public interface CaiUserOnlineMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserRiskLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserRiskLogMapper.java index 1751394a..645fb1df 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserRiskLogMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserRiskLogMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiUserRiskLog; +import com.ruoyi.cai.domain.UserRiskLog; /** * 高风险操作日志Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserRiskLog; * @author 77 * @date 2023-12-22 */ -public interface CaiUserRiskLogMapper extends BaseMapper { +public interface CaiUserRiskLogMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java index 8b3cb335..ec3558cb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java @@ -2,7 +2,7 @@ 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.CaiUserVisitor; +import com.ruoyi.cai.domain.UserVisitor; import com.ruoyi.cai.dto.app.query.VisitorQuery; import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; * @author 77 * @date 2023-12-24 */ -public interface CaiUserVisitorMapper extends BaseMapper { +public interface CaiUserVisitorMapper extends BaseMapper { Page pageApp(@Param("build") Page build, @Param("query") VisitorQuery query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiWithdrawExchangeMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiWithdrawExchangeMapper.java index 1e55ec6a..ea9c6769 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiWithdrawExchangeMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiWithdrawExchangeMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiWithdrawExchange; +import com.ruoyi.cai.domain.WithdrawExchange; /** * 提现 - 兑换配置Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiWithdrawExchange; * @author 77 * @date 2023-12-24 */ -public interface CaiWithdrawExchangeMapper extends BaseMapper { +public interface CaiWithdrawExchangeMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBankcardService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBankcardService.java index 2244cf1c..a447a3d0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBankcardService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBankcardService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiAccountBankcard; +import com.ruoyi.cai.domain.AccountBankcard; /** * 用户银行卡Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountBankcard; * @author 77 * @date 2023-12-21 */ -public interface CaiAccountBankcardService extends IService { +public interface CaiAccountBankcardService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBusinessService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBusinessService.java index ab00acbf..30d2d52c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBusinessService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBusinessService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiAccountBusiness; +import com.ruoyi.cai.domain.AccountBusiness; /** * 账户业务Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountBusiness; * @author 77 * @date 2023-12-22 */ -public interface CaiAccountBusinessService extends IService { +public interface CaiAccountBusinessService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java index d1a7e78f..8b476a65 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiAccountCash; +import com.ruoyi.cai.domain.AccountCash; import com.ruoyi.cai.dto.app.query.WithdrawReq; /** @@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.app.query.WithdrawReq; * @author 77 * @date 2023-12-21 */ -public interface CaiAccountCashService extends IService { +public interface CaiAccountCashService extends IService { void withdraw(WithdrawReq res); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountDetailService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountDetailService.java index d1326770..a045e152 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountDetailService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountDetailService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiAccountDetail; +import com.ruoyi.cai.domain.AccountDetail; /** * 账户明细Service接口 @@ -9,7 +9,7 @@ import com.ruoyi.cai.domain.CaiAccountDetail; * @author 77 * @date 2023-12-22 */ -public interface CaiAccountDetailService extends IService { +public interface CaiAccountDetailService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountRechargeService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountRechargeService.java index 09d5cefd..e6eaf094 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountRechargeService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountRechargeService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiAccountRecharge; +import com.ruoyi.cai.domain.AccountRecharge; /** * 充值记录Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountRecharge; * @author 77 * @date 2023-12-22 */ -public interface CaiAccountRechargeService extends IService { +public interface CaiAccountRechargeService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java index a1648b10..c8644119 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiAccount; +import com.ruoyi.cai.domain.Account; import com.ruoyi.cai.domain.CaiConsumeLog; /** @@ -10,9 +10,9 @@ import com.ruoyi.cai.domain.CaiConsumeLog; * @author 77 * @date 2023-12-23 */ -public interface CaiAccountService extends IService { +public interface CaiAccountService extends IService { - CaiAccount getByUserId(Long userId); + Account getByUserId(Long userId); CaiConsumeLog decr(CaiConsumeLog log); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorApplyService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorApplyService.java index 5076b217..30621cb2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorApplyService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorApplyService.java @@ -2,8 +2,8 @@ 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.CaiAnchorApply; -import com.ruoyi.cai.dto.admin.vo.CaiAnchorApplyAdminVo; +import com.ruoyi.cai.domain.AnchorApply; +import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo; import com.ruoyi.cai.dto.app.vo.AnchorJoinHomeVo; import com.ruoyi.common.core.domain.PageQuery; @@ -13,11 +13,11 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-22 */ -public interface CaiAnchorApplyService extends IService { +public interface CaiAnchorApplyService extends IService { - CaiAnchorApply getByUserId(Long userId); + AnchorApply getByUserId(Long userId); - Page pageAdmin(PageQuery pageQuery, CaiAnchorApplyAdminVo bo); + Page pageAdmin(PageQuery pageQuery, AnchorApplyAdminVo bo); AnchorJoinHomeVo joinHome(Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorService.java index fd0636e6..1a8c07e2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorService.java @@ -2,8 +2,8 @@ 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.CaiAnchor; -import com.ruoyi.cai.dto.admin.vo.CaiAnchorAdminVo; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo; import com.ruoyi.cai.dto.app.query.AnchorListQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.common.core.domain.PageQuery; @@ -14,13 +14,13 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-22 */ -public interface CaiAnchorService extends IService { +public interface CaiAnchorService extends IService { - Page pageAdmin(PageQuery pageQuery, CaiAnchorAdminVo bo); + Page pageAdmin(PageQuery pageQuery, AnchorAdminVo bo); Page pageApp(PageQuery pageQuery, AnchorListQuery query); - CaiAnchor getByUserId(Long userId); + Anchor getByUserId(Long userId); void updateVideoStatus(Long userId, int videoStatus); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAreaService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAreaService.java index c467c95e..59bd91d1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAreaService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAreaService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiArea; +import com.ruoyi.cai.domain.Area; /** * 地区Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiArea; * @author 77 * @date 2023-12-23 */ -public interface CaiAreaService extends IService { +public interface CaiAreaService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiBannerService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiBannerService.java index 4c52a3db..6e3da46f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiBannerService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiBannerService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiBanner; +import com.ruoyi.cai.domain.Banner; import java.util.List; @@ -11,6 +11,6 @@ import java.util.List; * @author 77 * @date 2023-12-21 */ -public interface CaiBannerService extends IService { - List index(); +public interface CaiBannerService extends IService { + List index(); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiCitysService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiCitysService.java index c48ec892..91b650d8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiCitysService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiCitysService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiCitys; +import com.ruoyi.cai.domain.Citys; import java.util.Map; @@ -11,7 +11,7 @@ import java.util.Map; * @author 77 * @date 2023-12-30 */ -public interface CaiCitysService extends IService { +public interface CaiCitysService extends IService { Map all(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicImagesService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicImagesService.java index 06464181..284353e0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicImagesService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicImagesService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiDynamicImages; +import com.ruoyi.cai.domain.DynamicImages; /** * 附件Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiDynamicImages; * @author 77 * @date 2023-12-23 */ -public interface CaiDynamicImagesService extends IService { +public interface CaiDynamicImagesService extends IService { } 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 665ce457..ea01d9d3 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 @@ -2,11 +2,10 @@ 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.CaiDynamic; +import com.ruoyi.cai.domain.Dynamic; import com.ruoyi.cai.dto.app.query.DynamicAddReq; import com.ruoyi.cai.dto.app.query.DynamicQuery; import com.ruoyi.cai.dto.app.vo.DynamicListVo; -import com.ruoyi.cai.dto.app.vo.DynamicVo; import com.ruoyi.common.core.domain.PageQuery; import java.util.List; @@ -17,7 +16,7 @@ import java.util.List; * @author 77 * @date 2023-12-23 */ -public interface CaiDynamicService extends IService { +public interface CaiDynamicService extends IService { List selectDynamicImageList(Long userId, Integer limit); 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 d5ed7a22..311648a5 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 @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiGift; +import com.ruoyi.cai.domain.Gift; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * @author 77 * @date 2023-12-23 */ -public interface CaiGiftService extends IService { +public interface CaiGiftService extends IService { - List all(); + List all(); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiveLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiveLogService.java index 4da2b05d..c15d37e3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiveLogService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiveLogService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiGiveLog; +import com.ruoyi.cai.domain.GiveLog; /** * 赠送记录Service接口 @@ -9,5 +9,5 @@ import com.ruoyi.cai.domain.CaiGiveLog; * @author 77 * @date 2023-12-24 */ -public interface CaiGiveLogService extends IService { +public interface CaiGiveLogService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGoodsService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGoodsService.java index 20a5dae3..82a32afe 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGoodsService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGoodsService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiGoods; +import com.ruoyi.cai.domain.Goods; /** * 充值配置Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGoods; * @author 77 * @date 2023-12-24 */ -public interface CaiGoodsService extends IService { +public interface CaiGoodsService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java index c6dab595..8929547d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiGuardLog; +import com.ruoyi.cai.domain.GuardLog; /** * 守护赠送流水Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGuardLog; * @author 77 * @date 2023-12-30 */ -public interface CaiGuardLogService extends IService { +public interface CaiGuardLogService extends IService { } 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 ffdc7154..481206fc 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 @@ -2,7 +2,7 @@ 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.domain.GuardTotal; import com.ruoyi.cai.dto.app.dto.GuardNum; import com.ruoyi.cai.dto.app.query.GiveGuardReq; import com.ruoyi.cai.dto.app.vo.index.GuardIndexVo; @@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-23 */ -public interface CaiGuardTotalService extends IService { +public interface CaiGuardTotalService extends IService { GuardIndexVo guardInfoVo(Long fromUserId,Long toUserId, Integer limit); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java index 99bd365f..a6c0db14 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java @@ -2,8 +2,8 @@ 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.CaiLowHeightRisk; -import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo; +import com.ruoyi.cai.domain.LowHeightRisk; +import com.ruoyi.cai.dto.admin.vo.LowHeightRiskAdminVo; import com.ruoyi.common.core.domain.PageQuery; /** @@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-22 */ -public interface CaiLowHeightRiskService extends IService { +public interface CaiLowHeightRiskService extends IService { - Page pageAdmin(PageQuery pageQuery, CaiLowHeightRiskAdminVo bo); + Page pageAdmin(PageQuery pageQuery, LowHeightRiskAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiMemberSkillService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiMemberSkillService.java index 8db61e05..0d515fbd 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiMemberSkillService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiMemberSkillService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiMemberSkill; +import com.ruoyi.cai.domain.MemberSkill; /** * 会员技能Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiMemberSkill; * @author 77 * @date 2023-12-30 */ -public interface CaiMemberSkillService extends IService { +public interface CaiMemberSkillService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportCateService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportCateService.java index f1c23337..301af91c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportCateService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportCateService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiReportCate; +import com.ruoyi.cai.domain.ReportCate; /** * 举报分类Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiReportCate; * @author 77 * @date 2023-12-24 */ -public interface CaiReportCateService extends IService { +public interface CaiReportCateService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java index 0a2e2871..6cd93d45 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiReport; +import com.ruoyi.cai.domain.Report; import com.ruoyi.cai.dto.app.query.UserReportReq; /** @@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.app.query.UserReportReq; * @author 77 * @date 2023-12-24 */ -public interface CaiReportService extends IService { +public interface CaiReportService extends IService { void report(UserReportReq reportRes); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java index 63c5d50d..d4d47ac5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java @@ -2,8 +2,8 @@ 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.CaiUnion; -import com.ruoyi.cai.dto.admin.vo.CaiUnionAdminVo; +import com.ruoyi.cai.domain.Union; +import com.ruoyi.cai.dto.admin.vo.UnionAdminVo; import com.ruoyi.common.core.domain.PageQuery; /** @@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-22 */ -public interface CaiUnionService extends IService { +public interface CaiUnionService extends IService { - Page pageAdmin(PageQuery pageQuery, CaiUnionAdminVo bo); + Page pageAdmin(PageQuery pageQuery, UnionAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java index c2ea147a..1f2d713e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUnionUser; +import com.ruoyi.cai.domain.UnionUser; /** * 123Service接口 @@ -9,7 +9,7 @@ import com.ruoyi.cai.domain.CaiUnionUser; * @author ruoyi * @date 2023-12-22 */ -public interface CaiUnionUserService extends IService { +public interface CaiUnionUserService extends IService { - CaiUnionUser getByUserId(Long userId); + UnionUser getByUserId(Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java index 450206ac..1e035a54 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserAlbum; +import com.ruoyi.cai.domain.UserAlbum; import com.ruoyi.cai.dto.app.query.AlbumAddReq; import com.ruoyi.cai.dto.app.query.AlbumResetReq; @@ -13,12 +13,12 @@ import java.util.List; * @author 77 * @date 2023-12-23 */ -public interface CaiUserAlbumService extends IService { +public interface CaiUserAlbumService extends IService { List getUserAlbum(Long userId, Integer anchor); - List listByUserId(Long userId); + List listByUserId(Long userId); boolean addAlbum(AlbumAddReq res); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserBlacklistService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserBlacklistService.java index 2843be16..f9c9da3c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserBlacklistService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserBlacklistService.java @@ -2,7 +2,7 @@ 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.CaiUserBlacklist; +import com.ruoyi.cai.domain.UserBlacklist; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.common.core.domain.PageQuery; @@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-30 */ -public interface CaiUserBlacklistService extends IService { +public interface CaiUserBlacklistService extends IService { /** * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCallService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCallService.java index d146a5db..f3ce74d5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCallService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCallService.java @@ -1,9 +1,9 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiAnchor; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserCall; /** * 通话记录Service接口 @@ -11,7 +11,7 @@ import com.ruoyi.cai.domain.CaiUserCall; * @author 77 * @date 2023-12-27 */ -public interface CaiUserCallService extends IService { +public interface CaiUserCallService extends IService { - CaiUserCall createCall(CaiUser fromUser, CaiUser toUser, CaiAnchor anchor); + UserCall createCall(User fromUser, User toUser, Anchor anchor); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCameraAuditService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCameraAuditService.java index f0b10a16..c8f8839b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCameraAuditService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCameraAuditService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserCameraAudit; +import com.ruoyi.cai.domain.UserCameraAudit; import com.ruoyi.cai.dto.app.vo.CameraAuditVo; /** @@ -10,9 +10,9 @@ import com.ruoyi.cai.dto.app.vo.CameraAuditVo; * @author 77 * @date 2023-12-30 */ -public interface CaiUserCameraAuditService extends IService { +public interface CaiUserCameraAuditService extends IService { - CaiUserCameraAudit getByUserId(Long userId); + UserCameraAudit getByUserId(Long userId); CameraAuditVo cameraAudit(Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCodeGenService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCodeGenService.java index 71927d27..22b60fa7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCodeGenService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCodeGenService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserCodeGen; +import com.ruoyi.cai.domain.UserCodeGen; /** * idService接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserCodeGen; * @author 77 * @date 2023-12-21 */ -public interface CaiUserCodeGenService extends IService { +public interface CaiUserCodeGenService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCountService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCountService.java index 1c8aba9c..f32b83ef 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCountService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCountService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserCount; +import com.ruoyi.cai.domain.UserCount; /** * 用户信息数量统计Service接口 @@ -9,12 +9,12 @@ import com.ruoyi.cai.domain.CaiUserCount; * @author 77 * @date 2023-12-24 */ -public interface CaiUserCountService extends IService { +public interface CaiUserCountService extends IService { void star(Long fromUserId,Long toUserId); void unStar(Long fromUserId,Long toUserId); void visitor(Long fromUserId,Long toUserId); void reset(Long userId); void resetAsync(Long userId); - CaiUserCount getByUserId(Long userId); + UserCount getByUserId(Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java index 8fb22f4a..db14aa78 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserFollowDynamic; +import com.ruoyi.cai.domain.UserFollowDynamic; import com.ruoyi.cai.dto.app.query.DynamicStarReq; /** @@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.app.query.DynamicStarReq; * @author 77 * @date 2023-12-23 */ -public interface CaiUserFollowDynamicService extends IService { +public interface CaiUserFollowDynamicService extends IService { void star(DynamicStarReq query); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java index 73b1907d..0cb854ff 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java @@ -2,7 +2,7 @@ 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.CaiUserFollow; +import com.ruoyi.cai.domain.UserFollow; import com.ruoyi.cai.dto.app.query.StarQuery; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; @@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-23 */ -public interface CaiUserFollowService extends IService { +public interface CaiUserFollowService extends IService { Long getFansNumByUserId(Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserForbidService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserForbidService.java index 11a77bc3..059bdffe 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserForbidService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserForbidService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserForbid; +import com.ruoyi.cai.domain.UserForbid; /** * 封号列表Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserForbid; * @author 77 * @date 2023-12-21 */ -public interface CaiUserForbidService extends IService { +public interface CaiUserForbidService extends IService { } 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 64d48f8f..41a7da58 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 @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserGift; +import com.ruoyi.cai.domain.UserGift; import com.ruoyi.cai.dto.app.query.GiveGiftRes; import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; @@ -13,7 +13,7 @@ import java.util.List; * @author 77 * @date 2023-12-23 */ -public interface CaiUserGiftService extends IService { +public interface CaiUserGiftService extends IService { List selectGiftList(Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInfoService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInfoService.java index e9bac6e5..94c853e3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInfoService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInfoService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserInfo; +import com.ruoyi.cai.domain.UserInfo; -public interface CaiUserInfoService extends IService { +public interface CaiUserInfoService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java index eb0c2e85..6996e3af 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java @@ -2,7 +2,7 @@ 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.CaiUserInvite; +import com.ruoyi.cai.domain.UserInvite; import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.common.core.domain.PageQuery; @@ -13,9 +13,9 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-28 */ -public interface CaiUserInviteService extends IService { +public interface CaiUserInviteService extends IService { - CaiUserInvite getByUserId(Long id); + UserInvite getByUserId(Long id); InviteHomeVo inviteHome(Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java index eb8c9fe0..a980d005 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java @@ -2,8 +2,8 @@ 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.CaiUserMember; -import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; +import com.ruoyi.cai.domain.UserMember; +import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo; import com.ruoyi.common.core.domain.PageQuery; /** @@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-21 */ -public interface CaiUserMemberService extends IService { +public interface CaiUserMemberService extends IService { - Page pageAdmin(PageQuery pageQuery, CaiUserMemberAdminVo bo); + Page pageAdmin(PageQuery pageQuery, UserMemberAdminVo bo); } 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 4fbf6627..f8f8dab7 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 @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserOnline; +import com.ruoyi.cai.domain.UserOnline; import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; /** @@ -10,9 +10,9 @@ import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; * @author 77 * @date 2023-12-23 */ -public interface CaiUserOnlineService extends IService { +public interface CaiUserOnlineService extends IService { - CaiUserOnline getByUserId(Long userId); + UserOnline 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/CaiUserRiskLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java index ca1e0259..5394a5a7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiUserRiskLog; +import com.ruoyi.cai.domain.UserRiskLog; /** * 高风险操作日志Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserRiskLog; * @author 77 * @date 2023-12-22 */ -public interface CaiUserRiskLogService extends IService { +public interface CaiUserRiskLogService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java index 29e148e7..b79a01b8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java @@ -3,8 +3,8 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.auth.LoginCaiUser; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.dto.admin.vo.UserAdminVo; import com.ruoyi.cai.dto.app.query.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; @@ -16,19 +16,19 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-19 */ -public interface CaiUserService extends IService { +public interface CaiUserService extends IService { - CaiUser getByUsername(String username); + User getByUsername(String username); void register(LoginCaiUser caiUser); - Page pageAdmin(PageQuery pageQuery, CaiUser query); + Page pageAdmin(PageQuery pageQuery, User query); Page pageApp(PageQuery page, UserQuery query); UserInfoVo info(Long userId); - CaiUser getByUserCode(String userCode); + User getByUserCode(String userCode); void updateVideoStatus(Long userId, int videoStatus); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java index f1fbd45e..cb813cf3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java @@ -2,7 +2,7 @@ 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.CaiUserVisitor; +import com.ruoyi.cai.domain.UserVisitor; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.VisitorQuery; import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; @@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.PageQuery; * @author 77 * @date 2023-12-24 */ -public interface CaiUserVisitorService extends IService { +public interface CaiUserVisitorService extends IService { boolean visitor(StarOrVisitorReq starOrVisitorReq); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiWithdrawExchangeService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiWithdrawExchangeService.java index fcf50dfb..cf347d4f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiWithdrawExchangeService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiWithdrawExchangeService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiWithdrawExchange; +import com.ruoyi.cai.domain.WithdrawExchange; /** * 提现 - 兑换配置Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiWithdrawExchange; * @author 77 * @date 2023-12-24 */ -public interface CaiWithdrawExchangeService extends IService { +public interface CaiWithdrawExchangeService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBankcardServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBankcardServiceImpl.java index a163ff97..8d5b684b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBankcardServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBankcardServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiAccountBankcard; +import com.ruoyi.cai.domain.AccountBankcard; import com.ruoyi.cai.mapper.CaiAccountBankcardMapper; import com.ruoyi.cai.service.CaiAccountBankcardService; import org.springframework.stereotype.Service; @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; * @date 2023-12-21 */ @Service -public class CaiAccountBankcardServiceImpl extends ServiceImpl implements CaiAccountBankcardService { +public class CaiAccountBankcardServiceImpl extends ServiceImpl implements CaiAccountBankcardService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBusinessServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBusinessServiceImpl.java index f9e82cea..061c379e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBusinessServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBusinessServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiAccountBusiness; +import com.ruoyi.cai.domain.AccountBusiness; import com.ruoyi.cai.mapper.CaiAccountBusinessMapper; import com.ruoyi.cai.service.CaiAccountBusinessService; import org.springframework.stereotype.Service; @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; * @date 2023-12-22 */ @Service -public class CaiAccountBusinessServiceImpl extends ServiceImpl implements CaiAccountBusinessService { +public class CaiAccountBusinessServiceImpl extends ServiceImpl implements CaiAccountBusinessService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java index 897e8427..8f9fd7db 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java @@ -2,9 +2,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.CaiAccountBankcard; -import com.ruoyi.cai.domain.CaiAccountCash; -import com.ruoyi.cai.domain.CaiWithdrawExchange; +import com.ruoyi.cai.domain.AccountBankcard; +import com.ruoyi.cai.domain.AccountCash; +import com.ruoyi.cai.domain.WithdrawExchange; import com.ruoyi.cai.dto.app.query.WithdrawReq; import com.ruoyi.cai.mapper.CaiAccountCashMapper; import com.ruoyi.cai.service.CaiAccountBankcardService; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; @Service -public class CaiAccountCashServiceImpl extends ServiceImpl implements CaiAccountCashService { +public class CaiAccountCashServiceImpl extends ServiceImpl implements CaiAccountCashService { @Autowired private CaiAccountBankcardService accountBankcardService; @Autowired @@ -27,18 +27,18 @@ public class CaiAccountCashServiceImpl extends ServiceImpl implements CaiAccountDetailService { +public class CaiAccountDetailServiceImpl extends ServiceImpl implements CaiAccountDetailService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountRechargeServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountRechargeServiceImpl.java index 451b879a..881f72bb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountRechargeServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountRechargeServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiAccountRecharge; +import com.ruoyi.cai.domain.AccountRecharge; import com.ruoyi.cai.mapper.CaiAccountRechargeMapper; import com.ruoyi.cai.service.CaiAccountRechargeService; import org.springframework.stereotype.Service; @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; * @date 2023-12-22 */ @Service -public class CaiAccountRechargeServiceImpl extends ServiceImpl implements CaiAccountRechargeService { +public class CaiAccountRechargeServiceImpl extends ServiceImpl implements CaiAccountRechargeService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountServiceImpl.java index e34c0d12..fbd60805 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountServiceImpl.java @@ -14,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; - /** * 用户账户Service业务层处理 * @@ -24,15 +22,15 @@ import java.math.BigDecimal; */ @Service @Slf4j -public class CaiAccountServiceImpl extends ServiceImpl implements CaiAccountService { +public class CaiAccountServiceImpl extends ServiceImpl implements CaiAccountService { @Autowired private CaiConsumeLogService consumeLogService; @Override - public CaiAccount getByUserId(Long userId) { - return this.getOne(Wrappers.lambdaQuery(CaiAccount.class).eq(CaiAccount::getUserId,userId).last("limit 1")); + public Account getByUserId(Long userId) { + return this.getOne(Wrappers.lambdaQuery(Account.class).eq(Account::getUserId,userId).last("limit 1")); } @Override @@ -42,7 +40,7 @@ public class CaiAccountServiceImpl extends ServiceImpl implements CaiAnchorApplyService { +public class CaiAnchorApplyServiceImpl extends ServiceImpl implements CaiAnchorApplyService { @Autowired private CaiUserService userService; @Override - public CaiAnchorApply getByUserId(Long userId){ - return this.getOne(Wrappers.lambdaQuery(CaiAnchorApply.class) - .eq(CaiAnchorApply::getUserId,userId).last("limit 1")); + public AnchorApply getByUserId(Long userId){ + return this.getOne(Wrappers.lambdaQuery(AnchorApply.class) + .eq(AnchorApply::getUserId,userId).last("limit 1")); } @Override - public Page pageAdmin(PageQuery pageQuery, CaiAnchorApplyAdminVo bo) { + public Page pageAdmin(PageQuery pageQuery, AnchorApplyAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(),bo); } @Override public AnchorJoinHomeVo joinHome(Long userId) { - CaiUser user = userService.getById(userId); - CaiAnchorApply anchorApply = this.getByUserId(userId); + User user = userService.getById(userId); + AnchorApply anchorApply = this.getByUserId(userId); AnchorJoinHomeVo vo = new AnchorJoinHomeVo(); vo.setFinishStatus(user.getFinishStatus()); vo.setPhotoStatus(user.getPhotoStatus()); @@ -59,7 +59,7 @@ public class CaiAnchorApplyServiceImpl extends ServiceImpl implements CaiAnchorService { +public class CaiAnchorServiceImpl extends ServiceImpl implements CaiAnchorService { @Override - public Page pageAdmin(PageQuery pageQuery, CaiAnchorAdminVo bo) { + public Page pageAdmin(PageQuery pageQuery, AnchorAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(),bo); } @@ -38,14 +37,14 @@ public class CaiAnchorServiceImpl extends ServiceImpl } @Override - public CaiAnchor getByUserId(Long userId){ - return this.getOne(Wrappers.lambdaQuery(CaiAnchor.class).eq(CaiAnchor::getUserId,userId)); + public Anchor getByUserId(Long userId){ + return this.getOne(Wrappers.lambdaQuery(Anchor.class).eq(Anchor::getUserId,userId)); } @Override public void updateVideoStatus(Long userId, int videoStatus) { - this.update(Wrappers.lambdaUpdate(CaiAnchor.class) - .eq(CaiAnchor::getUserId,userId) - .set(CaiAnchor::getVideoStatus,videoStatus)); + this.update(Wrappers.lambdaUpdate(Anchor.class) + .eq(Anchor::getUserId,userId) + .set(Anchor::getVideoStatus,videoStatus)); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAreaServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAreaServiceImpl.java index 590f95a9..13ef3d96 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAreaServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAreaServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiArea; +import com.ruoyi.cai.domain.Area; import com.ruoyi.cai.mapper.CaiAreaMapper; import com.ruoyi.cai.service.CaiAreaService; import org.springframework.stereotype.Service; @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; * @date 2023-12-23 */ @Service -public class CaiAreaServiceImpl extends ServiceImpl implements CaiAreaService { +public class CaiAreaServiceImpl extends ServiceImpl implements CaiAreaService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiBannerServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiBannerServiceImpl.java index cf09d7df..9ff838bf 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiBannerServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiBannerServiceImpl.java @@ -2,7 +2,7 @@ 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.CaiBanner; +import com.ruoyi.cai.domain.Banner; import com.ruoyi.cai.mapper.CaiBannerMapper; import com.ruoyi.cai.service.CaiBannerService; import org.springframework.stereotype.Service; @@ -16,11 +16,11 @@ import java.util.List; * @date 2023-12-21 */ @Service -public class CaiBannerServiceImpl extends ServiceImpl implements CaiBannerService { +public class CaiBannerServiceImpl extends ServiceImpl implements CaiBannerService { @Override - public List index() { - List list = this.list(Wrappers.lambdaQuery(CaiBanner.class)); + public List index() { + List list = this.list(Wrappers.lambdaQuery(Banner.class)); return list; } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiCitysServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiCitysServiceImpl.java index e7587166..26e1e6ad 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiCitysServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiCitysServiceImpl.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.constant.RedisConstant; -import com.ruoyi.cai.domain.CaiCitys; +import com.ruoyi.cai.domain.Citys; import com.ruoyi.cai.mapper.CaiCitysMapper; import com.ruoyi.cai.service.CaiCitysService; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * @date 2023-12-30 */ @Service -public class CaiCitysServiceImpl extends ServiceImpl implements CaiCitysService { +public class CaiCitysServiceImpl extends ServiceImpl implements CaiCitysService { @Autowired private StringRedisTemplate redisTemplate; @@ -35,8 +35,8 @@ public class CaiCitysServiceImpl extends ServiceImpl im if(value != null){ return JSON.parseObject(value, new TypeReference>(){}); } - List list = this.list(); - Map map = list.stream().collect(Collectors.toMap(CaiCitys::getId, CaiCitys::getName)); + List list = this.list(); + Map map = list.stream().collect(Collectors.toMap(Citys::getId, Citys::getName)); redisTemplate.opsForValue().set(RedisConstant.CITY_CACHE_REDIS,JSON.toJSONString(map),30, TimeUnit.DAYS); return map; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicImagesServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicImagesServiceImpl.java index 3148a117..6f19a20f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicImagesServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicImagesServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiDynamicImages; +import com.ruoyi.cai.domain.DynamicImages; import com.ruoyi.cai.mapper.CaiDynamicImagesMapper; import com.ruoyi.cai.service.CaiDynamicImagesService; import org.springframework.stereotype.Service; @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; * @date 2023-12-23 */ @Service -public class CaiDynamicImagesServiceImpl extends ServiceImpl implements CaiDynamicImagesService { +public class CaiDynamicImagesServiceImpl extends ServiceImpl implements CaiDynamicImagesService { } 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 522476bc..6a1cd0a9 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 @@ -5,9 +5,9 @@ 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.cache.DynamicTotalCache; -import com.ruoyi.cai.domain.CaiDynamic; -import com.ruoyi.cai.domain.CaiDynamicImages; -import com.ruoyi.cai.domain.CaiUser; +import com.ruoyi.cai.domain.Dynamic; +import com.ruoyi.cai.domain.DynamicImages; +import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.app.query.DynamicAddReq; import com.ruoyi.cai.dto.app.query.DynamicQuery; import com.ruoyi.cai.dto.app.vo.DynamicImageVo; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class CaiDynamicServiceImpl extends ServiceImpl implements CaiDynamicService { +public class CaiDynamicServiceImpl extends ServiceImpl implements CaiDynamicService { @Autowired private CaiDynamicImagesService dynamicImagesService; @@ -61,12 +61,12 @@ public class CaiDynamicServiceImpl extends ServiceImpl records = page.getRecords(); List dynamicIds = records.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)); + List dynamicImages = dynamicImagesService.list(Wrappers.lambdaQuery(DynamicImages.class) + .in(DynamicImages::getDynamicId, dynamicIds)); + Map> map = + dynamicImages.stream().collect(Collectors.groupingBy(DynamicImages::getDynamicId)); for (DynamicVo re : records) { - List images = map.get(re.getId()); + List images = map.get(re.getId()); re.setImageList(BeanConvertUtil.convertListTo(images, DynamicImageVo::new)); } } @@ -78,7 +78,7 @@ public class CaiDynamicServiceImpl extends ServiceImpl 9){ throw new ServiceException("最多只能发送9张照片哦"); } - CaiUser user = userService.getById(res.getUserId()); + User user = userService.getById(res.getUserId()); if(user.getSendDynamic() == 0){ throw new ServiceException("您已被禁止发送动态"); } @@ -89,21 +89,21 @@ public class CaiDynamicServiceImpl extends ServiceImpl imageList = res.getImageList(); if(CollectionUtil.isNotEmpty(imageList)){ for (DynamicImageVo imageVo : imageList) { - imageVo.setDynamicId(caiDynamic.getId()); - imageVo.setUserId(caiDynamic.getUserId()); + imageVo.setDynamicId(dynamic.getId()); + imageVo.setUserId(dynamic.getUserId()); imageVo.setId(null); } - dynamicImagesService.saveBatch(BeanConvertUtil.convertListTo(imageList, CaiDynamicImages::new)); + dynamicImagesService.saveBatch(BeanConvertUtil.convertListTo(imageList, DynamicImages::new)); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiftServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiftServiceImpl.java index 23628136..59422be1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiftServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiftServiceImpl.java @@ -2,7 +2,7 @@ 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.CaiGift; +import com.ruoyi.cai.domain.Gift; import com.ruoyi.cai.mapper.CaiGiftMapper; import com.ruoyi.cai.service.CaiGiftService; import lombok.RequiredArgsConstructor; @@ -18,12 +18,12 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class CaiGiftServiceImpl extends ServiceImpl implements CaiGiftService { +public class CaiGiftServiceImpl extends ServiceImpl implements CaiGiftService { @Override - public List all() { - return this.list(Wrappers.lambdaQuery(CaiGift.class).eq(CaiGift::getStatus,0) - .orderByAsc(CaiGift::getSort) - .select(CaiGift::getId,CaiGift::getName,CaiGift::getPrice,CaiGift::getImg,CaiGift::getSvga)); + public List all() { + return this.list(Wrappers.lambdaQuery(Gift.class).eq(Gift::getStatus,0) + .orderByAsc(Gift::getSort) + .select(Gift::getId, Gift::getName, Gift::getPrice, Gift::getImg, Gift::getSvga)); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiveLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiveLogServiceImpl.java index b020c8a0..d830991e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiveLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiveLogServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiGiveLog; +import com.ruoyi.cai.domain.GiveLog; import com.ruoyi.cai.mapper.CaiGiveLogMapper; import com.ruoyi.cai.service.CaiGiveLogService; import org.springframework.stereotype.Service; @@ -13,6 +13,6 @@ import org.springframework.stereotype.Service; * @date 2023-12-24 */ @Service -public class CaiGiveLogServiceImpl extends ServiceImpl implements CaiGiveLogService { +public class CaiGiveLogServiceImpl extends ServiceImpl implements CaiGiveLogService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGoodsServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGoodsServiceImpl.java index 8ae7ed80..1ec3aff7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGoodsServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGoodsServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiGoods; +import com.ruoyi.cai.domain.Goods; import com.ruoyi.cai.mapper.CaiGoodsMapper; import com.ruoyi.cai.service.CaiGoodsService; import lombok.RequiredArgsConstructor; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; */ @RequiredArgsConstructor @Service -public class CaiGoodsServiceImpl extends ServiceImpl implements CaiGoodsService { +public class CaiGoodsServiceImpl extends ServiceImpl implements CaiGoodsService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardLogServiceImpl.java index 9ce4c596..08fcdd24 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardLogServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiGuardLog; +import com.ruoyi.cai.domain.GuardLog; import com.ruoyi.cai.mapper.CaiGuardLogMapper; import com.ruoyi.cai.service.CaiGuardLogService; import lombok.RequiredArgsConstructor; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; */ @RequiredArgsConstructor @Service -public class CaiGuardLogServiceImpl extends ServiceImpl implements CaiGuardLogService { +public class CaiGuardLogServiceImpl extends ServiceImpl implements CaiGuardLogService { } 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 d4853dab..306c1207 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 @@ -31,7 +31,7 @@ import java.util.stream.Collectors; * @date 2023-12-23 */ @Service -public class CaiGuardTotalServiceImpl extends ServiceImpl implements CaiGuardTotalService { +public class CaiGuardTotalServiceImpl extends ServiceImpl implements CaiGuardTotalService { @Autowired private CaiUserService userService; @@ -71,15 +71,15 @@ public class CaiGuardTotalServiceImpl extends ServiceImpl implements CaiLowHeightRiskService { +public class CaiLowHeightRiskServiceImpl extends ServiceImpl implements CaiLowHeightRiskService { @Override - public Page pageAdmin(PageQuery pageQuery, CaiLowHeightRiskAdminVo bo) { + public Page pageAdmin(PageQuery pageQuery, LowHeightRiskAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(),bo); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiMemberSkillServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiMemberSkillServiceImpl.java index c344612f..732a9854 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiMemberSkillServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiMemberSkillServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiMemberSkill; +import com.ruoyi.cai.domain.MemberSkill; import com.ruoyi.cai.mapper.CaiMemberSkillMapper; import com.ruoyi.cai.service.CaiMemberSkillService; import org.springframework.stereotype.Service; @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; * @date 2023-12-30 */ @Service -public class CaiMemberSkillServiceImpl extends ServiceImpl implements CaiMemberSkillService { +public class CaiMemberSkillServiceImpl extends ServiceImpl implements CaiMemberSkillService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportCateServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportCateServiceImpl.java index e3eeae34..75a4d7a9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportCateServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportCateServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiReportCate; +import com.ruoyi.cai.domain.ReportCate; import com.ruoyi.cai.mapper.CaiReportCateMapper; import com.ruoyi.cai.service.CaiReportCateService; import lombok.RequiredArgsConstructor; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; */ @RequiredArgsConstructor @Service -public class CaiReportCateServiceImpl extends ServiceImpl implements CaiReportCateService { +public class CaiReportCateServiceImpl extends ServiceImpl implements CaiReportCateService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java index dddf59f9..241d19eb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java @@ -1,8 +1,8 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiReport; -import com.ruoyi.cai.domain.CaiReportCate; +import com.ruoyi.cai.domain.Report; +import com.ruoyi.cai.domain.ReportCate; import com.ruoyi.cai.dto.app.query.UserReportReq; import com.ruoyi.cai.mapper.CaiReportMapper; import com.ruoyi.cai.service.CaiReportCateService; @@ -19,13 +19,13 @@ import org.springframework.stereotype.Service; */ @RequiredArgsConstructor @Service -public class CaiReportServiceImpl extends ServiceImpl implements CaiReportService { +public class CaiReportServiceImpl extends ServiceImpl implements CaiReportService { @Autowired private CaiReportCateService reportCateService; @Override public void report(UserReportReq reportRes) { - CaiReportCate reportCate = reportCateService.getById(reportRes.getCateId()); - CaiReport report = new CaiReport(); + ReportCate reportCate = reportCateService.getById(reportRes.getCateId()); + Report report = new Report(); report.setType(reportRes.getType()); report.setCateName(reportCate.getName()); report.setCateId(reportRes.getCateId()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java index 77d3e8f1..d61a53b0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java @@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiUnion; -import com.ruoyi.cai.dto.admin.vo.CaiUnionAdminVo; +import com.ruoyi.cai.domain.Union; +import com.ruoyi.cai.dto.admin.vo.UnionAdminVo; import com.ruoyi.cai.mapper.CaiUnionMapper; import com.ruoyi.cai.service.CaiUnionService; import com.ruoyi.common.core.domain.PageQuery; @@ -16,10 +16,10 @@ import org.springframework.stereotype.Service; * @date 2023-12-22 */ @Service -public class CaiUnionServiceImpl extends ServiceImpl implements CaiUnionService { +public class CaiUnionServiceImpl extends ServiceImpl implements CaiUnionService { @Override - public Page pageAdmin(PageQuery pageQuery, CaiUnionAdminVo bo) { + public Page pageAdmin(PageQuery pageQuery, UnionAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(),bo); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java index bb8d19a6..9824a1c6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java @@ -2,7 +2,7 @@ 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.CaiUnionUser; +import com.ruoyi.cai.domain.UnionUser; import com.ruoyi.cai.mapper.CaiUnionUserMapper; import com.ruoyi.cai.service.CaiUnionUserService; import org.springframework.stereotype.Service; @@ -14,12 +14,12 @@ import org.springframework.stereotype.Service; * @date 2023-12-22 */ @Service -public class CaiUnionUserServiceImpl extends ServiceImpl implements CaiUnionUserService { +public class CaiUnionUserServiceImpl extends ServiceImpl implements CaiUnionUserService { @Override - public CaiUnionUser getByUserId(Long userId){ - return this.getOne(Wrappers.lambdaQuery(CaiUnionUser.class) - .eq(CaiUnionUser::getUserId, userId) + public UnionUser getByUserId(Long userId){ + return this.getOne(Wrappers.lambdaQuery(UnionUser.class) + .eq(UnionUser::getUserId, userId) .last("limit 1")); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java index e5af57cc..e8b89d75 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java @@ -3,20 +3,18 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.domain.CaiUserAlbum; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserAlbum; import com.ruoyi.cai.dto.app.query.AlbumAddReq; import com.ruoyi.cai.dto.app.query.AlbumResetReq; import com.ruoyi.cai.mapper.CaiUserAlbumMapper; import com.ruoyi.cai.service.CaiUserAlbumService; import com.ruoyi.cai.service.CaiUserService; -import com.ruoyi.common.helper.LoginHelper; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -27,32 +25,32 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class CaiUserAlbumServiceImpl extends ServiceImpl implements CaiUserAlbumService { +public class CaiUserAlbumServiceImpl extends ServiceImpl implements CaiUserAlbumService { @Autowired private CaiUserService userService; @Override public List getUserAlbum(Long userId,Integer anchor){ - LambdaQueryWrapper eq = Wrappers.lambdaQuery(CaiUserAlbum.class) - .select(CaiUserAlbum::getUrl) - .eq(CaiUserAlbum::getUserId, userId); + LambdaQueryWrapper eq = Wrappers.lambdaQuery(UserAlbum.class) + .select(UserAlbum::getUrl) + .eq(UserAlbum::getUserId, userId); if(anchor != null && anchor == 1){ - eq.ne(CaiUserAlbum::getAuditRemark,2); + eq.ne(UserAlbum::getAuditRemark,2); }else{ - eq.eq(CaiUserAlbum::getAuditRemark,1); + eq.eq(UserAlbum::getAuditRemark,1); } - List list = this.list(eq); - return list.stream().map(CaiUserAlbum::getUrl).collect(Collectors.toList()); + List list = this.list(eq); + return list.stream().map(UserAlbum::getUrl).collect(Collectors.toList()); } @Override - public List listByUserId(Long userId) { - return this.list(Wrappers.lambdaQuery(CaiUserAlbum.class).eq(CaiUserAlbum::getUserId,userId)); + public List listByUserId(Long userId) { + return this.list(Wrappers.lambdaQuery(UserAlbum.class).eq(UserAlbum::getUserId,userId)); } @Override public boolean addAlbum(AlbumAddReq res) { - CaiUser user = userService.getById(res.getUserId()); - CaiUserAlbum album = new CaiUserAlbum(); + User user = userService.getById(res.getUserId()); + UserAlbum album = new UserAlbum(); album.setUserId(res.getUserId()); album.setUrl(res.getUrl()); album.setIsAnchor(user.getIsAnchor()); @@ -63,7 +61,7 @@ public class CaiUserAlbumServiceImpl extends ServiceImpl res, Long userId) { - List update = new ArrayList<>(); + List update = new ArrayList<>(); for (AlbumResetReq re : res) { - CaiUserAlbum album = new CaiUserAlbum(); + UserAlbum album = new UserAlbum(); album.setId(re.getId()); album.setOrderBy(re.getOrderBy()); update.add(album); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserBlacklistServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserBlacklistServiceImpl.java index a31dd938..c15b6ef0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserBlacklistServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserBlacklistServiceImpl.java @@ -3,15 +3,13 @@ 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.CaiUserBlacklist; +import com.ruoyi.cai.domain.UserBlacklist; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.cai.mapper.CaiUserBlacklistMapper; import com.ruoyi.cai.service.CaiUserBlacklistService; import com.ruoyi.common.core.domain.PageQuery; import org.springframework.stereotype.Service; -import java.util.List; - /** * 用户黑名单Service业务层处理 * @@ -19,21 +17,21 @@ import java.util.List; * @date 2023-12-30 */ @Service -public class CaiUserBlacklistServiceImpl extends ServiceImpl implements CaiUserBlacklistService { +public class CaiUserBlacklistServiceImpl extends ServiceImpl implements CaiUserBlacklistService { @Override public boolean black(Long userId, Long blackUserId,Integer actionType) { if(userId.equals(blackUserId)){ throw new SecurityException("不能对自己操作哦"); } if(actionType == 1){ // 拉黑 - CaiUserBlacklist userBlacklist = new CaiUserBlacklist(); + UserBlacklist userBlacklist = new UserBlacklist(); userBlacklist.setUserId(userId); userBlacklist.setBlackUid(blackUserId); this.save(userBlacklist); }else { // 取消拉黑 - this.remove(Wrappers.lambdaQuery(CaiUserBlacklist.class) - .eq(CaiUserBlacklist::getUserId,userId) - .eq(CaiUserBlacklist::getBlackUid,blackUserId)); + this.remove(Wrappers.lambdaQuery(UserBlacklist.class) + .eq(UserBlacklist::getUserId,userId) + .eq(UserBlacklist::getBlackUid,blackUserId)); } return true; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCallServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCallServiceImpl.java index 6ec6a9a9..0b027f30 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCallServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCallServiceImpl.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; */ @RequiredArgsConstructor @Service -public class CaiUserCallServiceImpl extends ServiceImpl implements CaiUserCallService { +public class CaiUserCallServiceImpl extends ServiceImpl implements CaiUserCallService { @Autowired private CaiAccountService accountService; @@ -29,7 +29,7 @@ public class CaiUserCallServiceImpl extends ServiceImpl implements CaiUserCameraAuditService { +public class CaiUserCameraAuditServiceImpl extends ServiceImpl implements CaiUserCameraAuditService { public static final Map ACTION_TYPES = new HashMap<>(); @@ -42,13 +39,13 @@ public class CaiUserCameraAuditServiceImpl extends ServiceImpl implements CaiUserCodeGenService { +public class CaiUserCodeGenServiceImpl extends ServiceImpl implements CaiUserCodeGenService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCountServiceImpl.java index 47c25020..051672d2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCountServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCountServiceImpl.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; */ @RequiredArgsConstructor @Service -public class CaiUserCountServiceImpl extends ServiceImpl implements CaiUserCountService { +public class CaiUserCountServiceImpl extends ServiceImpl implements CaiUserCountService { @Autowired private CaiUserVisitorService userVisitorService; @@ -55,21 +55,21 @@ public class CaiUserCountServiceImpl extends ServiceImpl implements CaiUserFollowDynamicService { +public class CaiUserFollowDynamicServiceImpl extends ServiceImpl implements CaiUserFollowDynamicService { @Autowired private CaiDynamicService dynamicService; @Override public void star(DynamicStarReq query) { - CaiDynamic dynamic = dynamicService.getById(query.getDynamicId()); + Dynamic dynamic = dynamicService.getById(query.getDynamicId()); if(dynamic == null){ return; } - this.remove(Wrappers.lambdaQuery(CaiUserFollowDynamic.class) - .eq(CaiUserFollowDynamic::getDynamicId,query.getDynamicId()) - .eq(CaiUserFollowDynamic::getUserId,query.getUserId())); - CaiUserFollowDynamic userFollowDynamic = new CaiUserFollowDynamic(); + this.remove(Wrappers.lambdaQuery(UserFollowDynamic.class) + .eq(UserFollowDynamic::getDynamicId,query.getDynamicId()) + .eq(UserFollowDynamic::getUserId,query.getUserId())); + UserFollowDynamic userFollowDynamic = new UserFollowDynamic(); userFollowDynamic.setUserId(query.getUserId()); userFollowDynamic.setFollowUid(dynamic.getUserId()); userFollowDynamic.setDynamicId(dynamic.getId()); @@ -43,8 +43,8 @@ public class CaiUserFollowDynamicServiceImpl extends ServiceImpl implements CaiUserFollowService { +public class CaiUserFollowServiceImpl extends ServiceImpl implements CaiUserFollowService { @Autowired private CaiUserCountService userCountService; @Override public Long getFansNumByUserId(Long userId){ - CaiUserCount count = userCountService.getByUserId(userId); + UserCount count = userCountService.getByUserId(userId); return count.getFansCount(); } @Override public boolean checkStar(Long userId,Long followUserId){ - long count = this.count(Wrappers.lambdaQuery(CaiUserFollow.class) - .eq(CaiUserFollow::getFollowUser, followUserId) - .eq(CaiUserFollow::getUserId, userId)); + long count = this.count(Wrappers.lambdaQuery(UserFollow.class) + .eq(UserFollow::getFollowUser, followUserId) + .eq(UserFollow::getUserId, userId)); if(count > 0){ return true; } @@ -52,10 +52,10 @@ public class CaiUserFollowServiceImpl extends ServiceImpl implements CaiUserForbidService { +public class CaiUserForbidServiceImpl extends ServiceImpl implements CaiUserForbidService { } 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 c681a488..14019f85 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 @@ -23,7 +23,7 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class CaiUserGiftServiceImpl extends ServiceImpl implements CaiUserGiftService { +public class CaiUserGiftServiceImpl extends ServiceImpl implements CaiUserGiftService { @Autowired private CaiGiftService giftService; @@ -43,13 +43,13 @@ public class CaiUserGiftServiceImpl extends ServiceImpl implements CaiUserInfoService { +public class CaiUserInfoServiceImpl extends ServiceImpl implements CaiUserInfoService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java index ebb2ddd8..a30a9b08 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java @@ -3,8 +3,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.CaiUser; -import com.ruoyi.cai.domain.CaiUserInvite; +import com.ruoyi.cai.domain.UserInvite; import com.ruoyi.cai.dto.app.dto.InviteCountDTO; import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; @@ -25,11 +24,11 @@ import java.util.List; * @date 2023-12-28 */ @Service -public class CaiUserInviteServiceImpl extends ServiceImpl implements CaiUserInviteService { +public class CaiUserInviteServiceImpl extends ServiceImpl implements CaiUserInviteService { @Override - public CaiUserInvite getByUserId(Long id) { - return this.getOne(Wrappers.lambdaQuery(CaiUserInvite.class).eq(CaiUserInvite::getUserId,id).last("limit 1")); + public UserInvite getByUserId(Long id) { + return this.getOne(Wrappers.lambdaQuery(UserInvite.class).eq(UserInvite::getUserId,id).last("limit 1")); } @Autowired diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java index 93cf14f6..512232e4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java @@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiUserMember; -import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; +import com.ruoyi.cai.domain.UserMember; +import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo; import com.ruoyi.cai.mapper.CaiUserMemberMapper; import com.ruoyi.cai.service.CaiUserMemberService; import com.ruoyi.common.core.domain.PageQuery; @@ -16,10 +16,10 @@ import org.springframework.stereotype.Service; * @date 2023-12-21 */ @Service -public class CaiUserMemberServiceImpl extends ServiceImpl implements CaiUserMemberService { +public class CaiUserMemberServiceImpl extends ServiceImpl implements CaiUserMemberService { @Override - public Page pageAdmin(PageQuery pageQuery, CaiUserMemberAdminVo bo) { + public Page pageAdmin(PageQuery pageQuery, UserMemberAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(),bo); } } 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 8ae6e1ba..c8e61fbb 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 @@ -2,7 +2,7 @@ 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.domain.UserOnline; import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; import com.ruoyi.cai.mapper.CaiUserOnlineMapper; import com.ruoyi.cai.service.CaiUserOnlineService; @@ -17,17 +17,17 @@ import org.springframework.stereotype.Service; */ @RequiredArgsConstructor @Service -public class CaiUserOnlineServiceImpl extends ServiceImpl implements CaiUserOnlineService { +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")); + public UserOnline getByUserId(Long userId){ + return this.getOne(Wrappers.lambdaQuery(UserOnline.class).eq(UserOnline::getUserId,userId).last("limit 1")); } @Override public OnlineStatusVo onlineStatus(Long userId,Integer openVideoStatus,Integer videoStatus,Integer isAnchor){ - CaiUserOnline userOnline = this.getByUserId(userId); + UserOnline userOnline = this.getByUserId(userId); Integer onlineStatus = userOnline.getStatus(); Integer status = 0; String statusMsg = "离线"; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java index 2c3c6b7e..ac6a69f4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiUserRiskLog; +import com.ruoyi.cai.domain.UserRiskLog; import com.ruoyi.cai.mapper.CaiUserRiskLogMapper; import com.ruoyi.cai.service.CaiUserRiskLogService; import org.springframework.stereotype.Service; @@ -13,6 +13,6 @@ import org.springframework.stereotype.Service; * @date 2023-12-22 */ @Service -public class CaiUserRiskLogServiceImpl extends ServiceImpl implements CaiUserRiskLogService { +public class CaiUserRiskLogServiceImpl extends ServiceImpl implements CaiUserRiskLogService { } 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 49462f27..29cd709d 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 @@ -4,9 +4,9 @@ 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.auth.LoginCaiUser; -import com.ruoyi.cai.domain.CaiAnchor; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.dto.admin.vo.UserAdminVo; import com.ruoyi.cai.dto.app.query.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; @@ -26,7 +26,7 @@ import org.springframework.stereotype.Service; * @date 2023-12-19 */ @Service -public class CaiUserServiceImpl extends ServiceImpl implements CaiUserService { +public class CaiUserServiceImpl extends ServiceImpl implements CaiUserService { @Autowired private CaiAnchorService anchorService; @Autowired @@ -43,9 +43,9 @@ public class CaiUserServiceImpl extends ServiceImpl impl private CaiUserOnlineService userOnlineService; @Override - public CaiUser getByUsername(String username) { - return this.getOne(Wrappers.lambdaQuery(CaiUser.class) - .eq(CaiUser::getMobile,username)); + public User getByUsername(String username) { + return this.getOne(Wrappers.lambdaQuery(User.class) + .eq(User::getMobile,username)); } @Override @@ -54,7 +54,7 @@ public class CaiUserServiceImpl extends ServiceImpl impl } @Override - public Page pageAdmin(PageQuery pageQuery, CaiUser query) { + public Page pageAdmin(PageQuery pageQuery, User query) { return baseMapper.pageAdmin(pageQuery.build(),query); } @@ -66,17 +66,17 @@ public class CaiUserServiceImpl extends ServiceImpl impl @Override public UserInfoVo info(Long userId) { Long currentUserId = LoginHelper.getUserId(); - CaiUser caiUser = this.getById(userId); - if(caiUser == null){ + User user = this.getById(userId); + if(user == null){ return null; } - CaiAnchor anchor = anchorService.getByUserId(userId); + Anchor anchor = anchorService.getByUserId(userId); UserInfoVo vo = new UserInfoVo(); vo.setUserId(userId); - vo.setIsAnchor(caiUser.getIsAnchor()); - vo.setUsercode(caiUser.getUsercode()); - vo.setNickname(caiUser.getNickname()); - vo.setAvatar(caiUser.getAvatar()); + vo.setIsAnchor(user.getIsAnchor()); + vo.setUsercode(user.getUsercode()); + vo.setNickname(user.getNickname()); + vo.setAvatar(user.getAvatar()); if(anchor != null){ vo.setPrice(anchor.getPrice()); vo.setServiceCount(anchor.getServiceCount()); @@ -86,16 +86,16 @@ public class CaiUserServiceImpl extends ServiceImpl impl } vo.setFansNum(userFollowService.getFansNumByUserId(userId)); vo.setStar(userFollowService.checkStar(currentUserId, userId)); - vo.setAlbumList(caiUserAlbumService.getUserAlbum(userId,caiUser.getIsAnchor())); + vo.setAlbumList(caiUserAlbumService.getUserAlbum(userId, user.getIsAnchor())); // 在线状态 OnlineStatusVo onlineStatusVo; - if(caiUser.getIsAnchor() == 1 && anchor != null){ - onlineStatusVo = userOnlineService.onlineStatus(userId,anchor.getOpenVideoStatus(),anchor.getVideoStatus(),caiUser.getIsAnchor()); + if(user.getIsAnchor() == 1 && anchor != null){ + onlineStatusVo = userOnlineService.onlineStatus(userId,anchor.getOpenVideoStatus(),anchor.getVideoStatus(), user.getIsAnchor()); }else{ - onlineStatusVo = userOnlineService.onlineStatus(userId,0,0,caiUser.getIsAnchor()); + onlineStatusVo = userOnlineService.onlineStatus(userId,0,0, user.getIsAnchor()); } vo.setOnlineStatus(onlineStatusVo); - if(caiUser.getIsAnchor() == 1){ + if(user.getIsAnchor() == 1){ vo.setGuardIndexVo(guardTotalService.guardInfoVo(currentUserId,userId,10)); vo.setDynamicList(dynamicService.selectDynamicImageList(userId,10)); vo.setGiftList(userGiftService.selectGiftList(userId)); @@ -104,36 +104,36 @@ public class CaiUserServiceImpl extends ServiceImpl impl } @Override - public CaiUser getByUserCode(String userCode){ - return this.getOne(Wrappers.lambdaQuery(CaiUser.class).eq(CaiUser::getUsercode,userCode).last("limit 1")); + public User getByUserCode(String userCode){ + return this.getOne(Wrappers.lambdaQuery(User.class).eq(User::getUsercode,userCode).last("limit 1")); } @Override public void updateVideoStatus(Long userId, int videoStatus) { - this.update(Wrappers.lambdaUpdate(CaiUser.class) - .eq(CaiUser::getId,userId) - .set(CaiUser::getVideoStatus,videoStatus)); + this.update(Wrappers.lambdaUpdate(User.class) + .eq(User::getId,userId) + .set(User::getVideoStatus,videoStatus)); } @Override public boolean agreeProtocol(Long userId) { - this.update(Wrappers.lambdaUpdate(CaiUser.class) - .eq(CaiUser::getId,userId) - .set(CaiUser::getAgreeProtocol,1)); + this.update(Wrappers.lambdaUpdate(User.class) + .eq(User::getId,userId) + .set(User::getAgreeProtocol,1)); return true; } @Override public void checkFinishStatus(Long userId) { - CaiUser user = this.getById(userId); + User user = this.getById(userId); if(user == null || user.getIsAnchor() == 1 || user.getFinishStatus() == 1){ return; } if(user.getCity() != null && user.getBirthday() != null && StringUtils.isNotEmpty(user.getNickname()) && user.getAvatarState() == 1){ - this.update(Wrappers.lambdaUpdate(CaiUser.class) - .eq(CaiUser::getId,user.getId()) - .set(CaiUser::getFinishStatus,1)); + this.update(Wrappers.lambdaUpdate(User.class) + .eq(User::getId,user.getId()) + .set(User::getFinishStatus,1)); } } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java index 502bedbc..6bd54393 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java @@ -3,7 +3,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.CaiUserVisitor; +import com.ruoyi.cai.domain.UserVisitor; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.VisitorQuery; import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; @@ -26,18 +26,18 @@ import java.time.LocalDateTime; */ @RequiredArgsConstructor @Service -public class CaiUserVisitorServiceImpl extends ServiceImpl implements CaiUserVisitorService { +public class CaiUserVisitorServiceImpl extends ServiceImpl implements CaiUserVisitorService { @Autowired private CaiUserCountService userCountService; @Override public boolean visitor(StarOrVisitorReq starOrVisitorReq) { Long fromUserId = LoginHelper.getUserId(); - CaiUserVisitor userVisitor = this.getOne(Wrappers.lambdaQuery(CaiUserVisitor.class) - .eq(CaiUserVisitor::getVisitorId, fromUserId) - .eq(CaiUserVisitor::getUserId, starOrVisitorReq.getToUserId()) + UserVisitor userVisitor = this.getOne(Wrappers.lambdaQuery(UserVisitor.class) + .eq(UserVisitor::getVisitorId, fromUserId) + .eq(UserVisitor::getUserId, starOrVisitorReq.getToUserId()) .last("limit 1")); if(userVisitor == null){ - userVisitor = new CaiUserVisitor(); + userVisitor = new UserVisitor(); userVisitor.setVisitorId(fromUserId); userVisitor.setUserId(starOrVisitorReq.getToUserId()); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiWithdrawExchangeServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiWithdrawExchangeServiceImpl.java index ff7d0e28..48b3e707 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiWithdrawExchangeServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiWithdrawExchangeServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiWithdrawExchange; +import com.ruoyi.cai.domain.WithdrawExchange; import com.ruoyi.cai.mapper.CaiWithdrawExchangeMapper; import com.ruoyi.cai.service.CaiWithdrawExchangeService; import org.springframework.stereotype.Service; @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; * @date 2023-12-24 */ @Service -public class CaiWithdrawExchangeServiceImpl extends ServiceImpl implements CaiWithdrawExchangeService { +public class CaiWithdrawExchangeServiceImpl extends ServiceImpl implements CaiWithdrawExchangeService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/dto/WsRMsgGen.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/dto/WsRMsgGen.java index e6503ae4..808f2502 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/dto/WsRMsgGen.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/dto/WsRMsgGen.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.ws.dto; import com.alibaba.fastjson.JSON; -import com.ruoyi.cai.domain.CaiGift; +import com.ruoyi.cai.domain.Gift; import java.util.HashMap; import java.util.Map; @@ -85,7 +85,7 @@ public class WsRMsgGen { return ok; } - public static WsR gift(CaiGift gift, Long callerId, Long receiverId) { + public static WsR gift(Gift gift, Long callerId, Long receiverId) { Map content = new HashMap<>(); content.put("giftid",gift.getId()); content.put("giftname",gift.getName()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java index 37b7135e..0a3ce780 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.ws.handler.message; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.UserCall; import com.ruoyi.cai.service.CaiUserCallService; import com.ruoyi.cai.ws.bean.FdCtxData; import com.ruoyi.cai.ws.bean.Room; @@ -37,10 +37,10 @@ public class AgreeMessageHandle extends AbstractMessageHandle implements IMessag return; } // 通知可进行接通 - userCallService.update(Wrappers.lambdaUpdate(CaiUserCall.class) - .eq(CaiUserCall::getId,room.getRoomId()) - .set(CaiUserCall::getStatus, RoomStatusEnums.STATUS_AGREE.getCode()) - .set(CaiUserCall::getBeginTime, LocalDateTime.now())); + userCallService.update(Wrappers.lambdaUpdate(UserCall.class) + .eq(UserCall::getId,room.getRoomId()) + .set(UserCall::getStatus, RoomStatusEnums.STATUS_AGREE.getCode()) + .set(UserCall::getBeginTime, LocalDateTime.now())); String message = "提示：禁止任何涉黄、任何微信QQ引导到其它平台行为"; sendToAll(room.getRoomId(), WsRMsgGen.startVideo(room.getRoomId(),0L),WsRMsgGen.sysNotice(message)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java index 81163a9a..05d6bdda 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.ws.handler.message; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.UserCall; import com.ruoyi.cai.service.CaiUserCallService; import com.ruoyi.cai.trd.ImDataRes; import com.ruoyi.cai.trd.ImMsgGen; @@ -48,8 +48,8 @@ public class CancelMessageHandler extends AbstractMessageHandle implements IMess ImDataRes imDataRes = ImMsgGen.callNotice(1, callerId, receiverId, 0); yunxin.sendTo(receiverId,imDataRes,callerId); // 更新房间状态 - userCallService.update(Wrappers.lambdaUpdate(CaiUserCall.class) - .eq(CaiUserCall::getId,roomId) - .set(CaiUserCall::getStatus,RoomStatusEnums.STATUS_CALLER_CANCEL.getCode())); + userCallService.update(Wrappers.lambdaUpdate(UserCall.class) + .eq(UserCall::getId,roomId) + .set(UserCall::getStatus,RoomStatusEnums.STATUS_CALLER_CANCEL.getCode())); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java index a6bbd3a3..5a48aa22 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java @@ -1,8 +1,8 @@ package com.ruoyi.cai.ws.handler.message; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.cai.domain.CaiAccount; -import com.ruoyi.cai.domain.CaiGift; +import com.ruoyi.cai.domain.Account; +import com.ruoyi.cai.domain.Gift; import com.ruoyi.cai.dto.app.query.GiveGiftRes; import com.ruoyi.cai.service.CaiAccountService; import com.ruoyi.cai.service.CaiGiftService; @@ -30,12 +30,12 @@ public class GiftMessageHandler extends AbstractMessageHandle implements IMessag return; } Long giftCount = map.getLongValue("giftCount",1L); - CaiGift gift = giftService.getById(giftId); + Gift gift = giftService.getById(giftId); if(gift == null){ return; } Long giftAmount = gift.getPrice() * giftCount; - CaiAccount account = accountService.getByUserId(fdCtxData.getUserId()); + Account account = accountService.getByUserId(fdCtxData.getUserId()); Long userAccount = account.getIncomeCoin() + account.getCoin(); if(userAccount < giftAmount){ sendToCurrent(fdCtxData,WsRMsgGen.rechargeNotice("余额不足，点此充值")); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java index c63d46d3..12ee2cca 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.ws.handler.message; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.UserCall; import com.ruoyi.cai.service.CaiUserCallService; import com.ruoyi.cai.trd.ImDataRes; import com.ruoyi.cai.trd.ImMsgGen; @@ -52,8 +52,8 @@ public class RefuseMessageHandler extends AbstractMessageHandle implements IMess yunxin.sendTo(receiverId,imDataRes,callerId); // 更新房间状态 - userCallService.update(Wrappers.lambdaUpdate(CaiUserCall.class) - .eq(CaiUserCall::getId,room.getRoomId()) - .set(CaiUserCall::getStatus,RoomStatusEnums.STATUS_REFUSE.getCode())); + userCallService.update(Wrappers.lambdaUpdate(UserCall.class) + .eq(UserCall::getId,room.getRoomId()) + .set(UserCall::getStatus,RoomStatusEnums.STATUS_REFUSE.getCode())); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java index 8e31d323..2d40151f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java @@ -1,8 +1,8 @@ package com.ruoyi.cai.ws.manager; -import com.ruoyi.cai.domain.CaiAnchor; -import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.domain.CaiUserCall; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserCall; import com.ruoyi.cai.service.CaiAnchorService; import com.ruoyi.cai.service.CaiUserCallService; import com.ruoyi.cai.service.CaiUserInviteService; @@ -55,7 +55,7 @@ public class WebSocketManager { } public Long createRoom(Long roomId) { - CaiUserCall userCall = userCallService.getById(roomId); + UserCall userCall = userCallService.getById(roomId); if(userCall == null){ throw new ServiceException("无效房间"); } @@ -76,17 +76,17 @@ public class WebSocketManager { return roomId; } - public Long initRoom(CaiUserCall call){ + public Long initRoom(UserCall call){ call = userCallService.getById(call.getId()); - CaiUser callUser = userService.getById(call.getFromUid()); + User callUser = userService.getById(call.getFromUid()); if(callUser == null){ throw new ServiceException("无效的呼叫方"); } - CaiUser receiverUser = userService.getById(call.getToUid()); + User receiverUser = userService.getById(call.getToUid()); if(receiverUser == null){ throw new ServiceException("无效的接收方"); } - CaiAnchor anchor = anchorService.getByUserId(call.getToUid()); + Anchor anchor = anchorService.getByUserId(call.getToUid()); if(anchor == null){ throw new ServiceException("接收方不是女神"); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java index 517475f4..0b4427b4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.ws.service; import cn.hutool.core.date.DateUtil; -import com.ruoyi.cai.domain.CaiAccount; +import com.ruoyi.cai.domain.Account; import com.ruoyi.cai.executor.ExecutorConstant; import com.ruoyi.cai.service.CaiAccountService; import com.ruoyi.cai.service.CaiAnchorService; @@ -133,7 +133,7 @@ public class RoomService { public Long canCallTime(Room room) { try { Long callId = room.getCallUserData().getId(); - CaiAccount account = accountService.getByUserId(callId); + Account account = accountService.getByUserId(callId); if(account == null){ return 0L; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java index ad56454c..8433a9c6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.ws.service; import cn.hutool.core.date.DateUtil; -import com.ruoyi.cai.domain.CaiAccount; +import com.ruoyi.cai.domain.Account; import com.ruoyi.cai.service.CaiAccountService; import com.ruoyi.cai.trd.ImDataRes; import com.ruoyi.cai.trd.ImMsgGen; @@ -104,7 +104,7 @@ public class SettleService { // 补差价 Long diff = totalAmount - roomData.getPayCoin() + roomData.getPayIncome(); - CaiAccount callAccount = accountService.getByUserId(callUserData.getId()); + Account callAccount = accountService.getByUserId(callUserData.getId()); Long userAmount = callAccount.getCoin() + callAccount.getIncomeCoin(); if(diff > 0){ // 账户上面有余额 diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBankcardMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBankcardMapper.xml index 19a29d7c..ab971c76 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBankcardMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBankcardMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBusinessMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBusinessMapper.xml index 6d3c617f..02ab04c6 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBusinessMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBusinessMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountCashMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountCashMapper.xml index dda55dbf..3648a927 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountCashMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountCashMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountDetailMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountDetailMapper.xml index 5d7a5bd6..12ab0a1e 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountDetailMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountDetailMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountMapper.xml index 9a771bc9..095bf544 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountRechargeMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountRechargeMapper.xml index 3d33a195..9d5e25c1 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountRechargeMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountRechargeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorApplyMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorApplyMapper.xml index 1a2e69ce..f021ccc9 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorApplyMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorApplyMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender from cai_anchor_apply t1 left join cai_user t2 on t1.user_id = t2.id diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorMapper.xml index 194b1182..25aaa927 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender,t2.age,t2.city from cai_anchor t1 diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAreaMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiAreaMapper.xml index 395822c6..10c2eb45 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAreaMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiAreaMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiBannerMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiBannerMapper.xml index 220e3e09..5bc015a4 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiBannerMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiBannerMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiCitysMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiCitysMapper.xml index 065af583..6212fcf7 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiCitysMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiCitysMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicImagesMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicImagesMapper.xml index 1a5c7fd3..3cf8cf40 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicImagesMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicImagesMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml index 13e06fb9..29ec42fd 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiftMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiGiftMapper.xml index cca767f8..852b8487 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiftMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiGiftMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiveLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiGiveLogMapper.xml index 18625411..fa1b31f1 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiveLogMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiGiveLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGoodsMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiGoodsMapper.xml index c20455fe..e2fc3a94 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGoodsMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiGoodsMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardLogMapper.xml index edf73046..2f3b0186 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardLogMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml index 56c335f6..3c86470a 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml index fe2dff84..7ef75300 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender from cai_low_height_risk t1 diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiMemberSkillMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiMemberSkillMapper.xml index b2ded867..be58a5b1 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiMemberSkillMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiMemberSkillMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportCateMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiReportCateMapper.xml index 0179cd68..5c106962 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportCateMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiReportCateMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiReportMapper.xml index 4eb94e1c..4d60c32f 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiReportMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiSkillMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiSkillMapper.xml deleted file mode 100644 index 366903b9..00000000 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiSkillMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml index 29d50fbb..5eedc038 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender,t2.union_time from cai_union t1 join cai_user t2 on t1.user_id = t2.id diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml index 9dc21778..53d51123 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserAlbumMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserAlbumMapper.xml index dab4c5e5..9aa98b99 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserAlbumMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserAlbumMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserBlacklistMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserBlacklistMapper.xml index f33e640c..f83abb6f 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserBlacklistMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserBlacklistMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCallMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCallMapper.xml index e883364a..03ca4398 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCallMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCallMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCameraAuditMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCameraAuditMapper.xml index 791c7a7e..45185651 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCameraAuditMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCameraAuditMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCodeGenMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCodeGenMapper.xml index 08f95748..e8d83480 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCodeGenMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCodeGenMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCountMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCountMapper.xml index 66b0d546..9c3c1dd5 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCountMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCountMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowDynamicMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowDynamicMapper.xml index 27b9fa38..5d3d0ab9 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowDynamicMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowDynamicMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml index 268f0d96..7bd01eb8 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserForbidMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserForbidMapper.xml index 367c1c74..52d24bf2 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserForbidMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserForbidMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml index 04e56344..b8050525 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml index 0e3d79db..3670a883 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml index dca7e28e..ac9dbfa9 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.*,t2.last_login_ip,t2.last_login_time,t2.reg_ip,t2.reg_time from cai_user t1 left join cai_user_info t2 on t1.id = t2.user_id diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml index 71661bcd..8eac4de7 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender from cai_user_member t1 join cai_user t2 on t1.user_id = t2.id diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserOnlineMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserOnlineMapper.xml index bc557574..a9804f29 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserOnlineMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserOnlineMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserRiskLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserRiskLogMapper.xml index d5829371..975cbd2e 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserRiskLogMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserRiskLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml index 6be7e85d..63b2a420 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiWithdrawExchangeMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiWithdrawExchangeMapper.xml index 3227fecb..6ed08bdc 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiWithdrawExchangeMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiWithdrawExchangeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +