This commit is contained in:
dute7liang
2023-12-31 16:09:56 +08:00
parent d1a59f2d4a
commit 0c1fc3cada
230 changed files with 662 additions and 580 deletions

View File

@@ -6,10 +6,10 @@ import com.ruoyi.cai.dto.app.vo.AnchorJoinHomeVo;
import com.ruoyi.cai.dto.app.vo.AnchorVo;
import com.ruoyi.cai.dto.app.vo.CameraAuditVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.CaiAnchorApplyService;
import com.ruoyi.cai.service.CaiAnchorService;
import com.ruoyi.cai.service.CaiUserCameraAuditService;
import com.ruoyi.cai.service.CaiUserService;
import com.ruoyi.cai.service.AnchorApplyService;
import com.ruoyi.cai.service.AnchorService;
import com.ruoyi.cai.service.UserCameraAuditService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.helper.LoginHelper;
import io.swagger.v3.oas.annotations.Operation;
@@ -26,13 +26,13 @@ public class AnchorAppController {
@Autowired
private CurrentUserManager currentUserManager;
@Autowired
private CaiUserCameraAuditService userCameraAuditService;
private UserCameraAuditService userCameraAuditService;
@Autowired
private CaiAnchorService anchorService;
private AnchorService anchorService;
@Autowired
private CaiUserService userService;
private UserService userService;
@Autowired
private CaiAnchorApplyService anchorApplyService;
private AnchorApplyService anchorApplyService;
@GetMapping("/info")
@Operation(summary = "当前用户的主播信息")

View File

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.cai.auth.CaiLoginManager;
import com.ruoyi.cai.auth.LoginCaiUser;
import com.ruoyi.cai.service.CaiUserService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.common.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,12 +25,12 @@ public class AuthAppController {
@Autowired
private CaiLoginManager caiLoginManager;
@Autowired
private CaiUserService caiUserService;
private UserService userService;
@PostMapping("/register")
@Operation(summary = "注册")
public R<Void> register(@RequestBody LoginCaiUser caiUser){
caiUserService.register(caiUser);
userService.register(caiUser);
return R.ok();
}

View File

@@ -2,8 +2,8 @@ package com.ruoyi.cai.controller.app;
import com.ruoyi.cai.dto.app.query.GiveGiftRes;
import com.ruoyi.cai.dto.app.query.GiveGuardReq;
import com.ruoyi.cai.service.CaiGuardTotalService;
import com.ruoyi.cai.service.CaiUserGiftService;
import com.ruoyi.cai.service.GuardTotalService;
import com.ruoyi.cai.service.UserGiftService;
import com.ruoyi.common.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RestController;
public class ConsumeController {
@Autowired
private CaiGuardTotalService guardTotalService;
private GuardTotalService guardTotalService;
@Autowired
private CaiUserGiftService userGiftService;
private UserGiftService userGiftService;
@PostMapping("/give/guard")
@Operation(summary = "赠送主播守护")

View File

@@ -31,15 +31,15 @@ import java.util.List;
public class IndexController {
@Autowired
private CaiAnchorService anchorService;
private AnchorService anchorService;
@Autowired
private CaiUserService caiUserService;
private UserService userService;
@Autowired
private CaiBannerService bannerService;
private BannerService bannerService;
@Autowired
private CaiGuardTotalService guardTotalService;
private GuardTotalService guardTotalService;
@Autowired
private CaiUserGiftService userGiftService;
private UserGiftService userGiftService;
@GetMapping("/banner")
@Operation(summary = "获取首页banner图")
@@ -58,14 +58,14 @@ public class IndexController {
@GetMapping("/user/page")
@Operation(summary = "用户全局查询-分页")
public TableDataInfo<UserListVo> page(PageQuery page, UserQuery query){
Page<UserListVo> res = caiUserService.pageApp(page,query);
Page<UserListVo> res = userService.pageApp(page,query);
return TableDataInfo.build(res);
}
@GetMapping("/home/info")
@Operation(summary = "获取指定用户主页信息")
public R<UserInfoVo> info(Long userId){
UserInfoVo res = caiUserService.info(userId);
UserInfoVo res = userService.info(userId);
return R.ok(res);
}

View File

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo;
import com.ruoyi.cai.dto.app.vo.user.UserListVo;
import com.ruoyi.cai.service.CaiUserInviteService;
import com.ruoyi.cai.service.UserInviteService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -15,15 +15,13 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("/api/invite")
@Tag(name = "邀请相关接口")
public class InviteAppController {
@Autowired
private CaiUserInviteService userInviteService;
private UserInviteService userInviteService;
@GetMapping("/home")
@Operation(summary = "邀请有奖页面")

View File

@@ -1,7 +1,7 @@
package com.ruoyi.cai.controller.app;
import com.ruoyi.cai.dto.app.query.UserReportReq;
import com.ruoyi.cai.service.CaiReportService;
import com.ruoyi.cai.service.ReportService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.helper.LoginHelper;
import io.swagger.v3.oas.annotations.Operation;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
public class OtherController {
@Autowired
private CaiReportService reportService;
private ReportService reportService;
@PostMapping("/report")
@Operation(summary = "举报")

View File

@@ -22,15 +22,15 @@ import java.util.Map;
public class SettingAppController {
@Autowired
private CaiGoodsService goodsService;
private GoodsService goodsService;
@Autowired
private CaiWithdrawExchangeService withdrawExchangeService;
private WithdrawExchangeService withdrawExchangeService;
@Autowired
private CaiReportCateService reportCateService;
private ReportCateService reportCateService;
@Autowired
private CaiCitysService citysService;
private CitysService citysService;
@Autowired
private CaiGiftService giftService;
private GiftService giftService;
@GetMapping("/goods")
@Operation(summary = "充值配置")

View File

@@ -6,7 +6,7 @@ import com.ruoyi.cai.dto.app.query.IdRes;
import com.ruoyi.cai.dto.app.query.UserUpdateReq;
import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.CaiUserAlbumService;
import com.ruoyi.cai.service.UserAlbumService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.helper.LoginHelper;
import io.swagger.v3.oas.annotations.Operation;
@@ -23,7 +23,7 @@ public class UserAppController {
@Autowired
private CurrentUserManager currentUserManager;
@Autowired
private CaiUserAlbumService userAlbumService;
private UserAlbumService userAlbumService;
@GetMapping("/info")
@Operation(summary = "当前用户信息")

View File

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.query.BlackQuery;
import com.ruoyi.cai.dto.app.vo.user.UserListVo;
import com.ruoyi.cai.service.CaiUserBlacklistService;
import com.ruoyi.cai.service.UserBlacklistService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
public class UserBlackAppController {
@Autowired
private CaiUserBlacklistService userBlacklistService;
private UserBlacklistService userBlacklistService;
@GetMapping("page")
@Operation(summary = "用户黑名单查询")

View File

@@ -5,8 +5,8 @@ import com.ruoyi.cai.dto.app.query.DynamicAddReq;
import com.ruoyi.cai.dto.app.query.DynamicQuery;
import com.ruoyi.cai.dto.app.query.DynamicStarReq;
import com.ruoyi.cai.dto.app.vo.DynamicListVo;
import com.ruoyi.cai.service.CaiDynamicService;
import com.ruoyi.cai.service.CaiUserFollowDynamicService;
import com.ruoyi.cai.service.DynamicService;
import com.ruoyi.cai.service.UserFollowDynamicService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -22,9 +22,9 @@ import org.springframework.web.bind.annotation.*;
public class UserDynamicAppController {
@Autowired
private CaiDynamicService dynamicService;
private DynamicService dynamicService;
@Autowired
private CaiUserFollowDynamicService userFollowDynamicService;
private UserFollowDynamicService userFollowDynamicService;
@GetMapping("/page")
@Operation(summary = "动态查询动态")

View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;
import com.ruoyi.cai.dto.app.query.StarQuery;
import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList;
import com.ruoyi.cai.service.CaiUserFollowService;
import com.ruoyi.cai.service.UserFollowService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
public class UserStartAppController {
@Autowired
private CaiUserFollowService userFollowService;
private UserFollowService userFollowService;
@PostMapping("/star")
@Operation(summary = "关注用户")

View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
import com.ruoyi.cai.service.CaiUserVisitorService;
import com.ruoyi.cai.service.UserVisitorService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class UserVisitorAppController {
@Autowired
private CaiUserVisitorService userVisitorService;
private UserVisitorService userVisitorService;
// 除网络问题不返回异常。避免影响业务
@PostMapping("/visitor")

View File

@@ -11,8 +11,8 @@ import com.ruoyi.cai.dto.app.vo.AccountCashVo;
import com.ruoyi.cai.dto.app.vo.AccountRechargeVo;
import com.ruoyi.cai.dto.app.vo.user.UserAccountVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.CaiAccountCashService;
import com.ruoyi.cai.service.CaiAccountRechargeService;
import com.ruoyi.cai.service.AccountCashService;
import com.ruoyi.cai.service.AccountRechargeService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -30,9 +30,9 @@ public class WalletController {
@Autowired
private CurrentUserManager currentUserManager;
@Autowired
private CaiAccountCashService accountCashService;
private AccountCashService accountCashService;
@Autowired
private CaiAccountRechargeService accountRechargeService;
private AccountRechargeService accountRechargeService;
@GetMapping("/account")
@Operation(summary = "快速获取当前用户账号余额信息")