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

@@ -5,8 +5,8 @@ import cn.dev33.satoken.stp.StpUtil;
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;
import com.ruoyi.cai.service.UserInfoService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserType;
@@ -28,13 +28,13 @@ import java.util.Collections;
public class CaiLoginManager {
@Autowired
private CaiUserService caiUserService;
private UserService userService;
@Autowired
private SysLoginService sysLoginService;
public String login(String username,String password){
User user = caiUserService.getByUsername(username);
User user = userService.getByUsername(username);
if(user == null){
throw new ServiceException("用户不存在或密码错误");
}
@@ -69,18 +69,18 @@ public class CaiLoginManager {
}
@Autowired
private CaiUserInfoService caiUserInfoService;
private UserInfoService userInfoService;
public void recordLoginInfo(User user, String ip) {
String address = AddressUtils.getRealAddressByIP(ip);
UserInfo userInfo = caiUserInfoService.getById(user.getId());
UserInfo userInfo = userInfoService.getById(user.getId());
UserInfo update = new UserInfo();
update.setUserId(user.getId());
update.setLoginCount(userInfo.getLoginCount()+1);
update.setLastLoginIp(ip);
update.setLastLoginTime(LocalDateTime.now());
update.setLastLocation(address);
caiUserInfoService.updateById(update);
userInfoService.updateById(update);
}

View File

@@ -10,10 +10,10 @@ import com.ruoyi.cai.dto.app.vo.chat.CallResp;
import com.ruoyi.cai.dto.app.vo.chat.GetRoomResp;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.service.CaiAnchorService;
import com.ruoyi.cai.service.CaiGuardTotalService;
import com.ruoyi.cai.service.CaiUserCallService;
import com.ruoyi.cai.service.CaiUserService;
import com.ruoyi.cai.service.AnchorService;
import com.ruoyi.cai.service.GuardTotalService;
import com.ruoyi.cai.service.UserCallService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.cai.ws.bean.Room;
import com.ruoyi.cai.ws.manager.WebSocketManager;
import com.ruoyi.common.exception.ServiceException;
@@ -30,19 +30,19 @@ import java.util.stream.Collectors;
@Component
public class ChatManager {
@Autowired
private CaiUserService userService;
private UserService userService;
@Autowired
private CaiAnchorService anchorService;
private AnchorService anchorService;
@Autowired
private WebSocketManager webSocketManager;
@Autowired
private CaiUserCallService userCallService;
private UserCallService userCallService;
@Autowired
private SystemConfigManager systemConfigManager;
@Autowired
private CaiProperties properties;
@Autowired
private CaiGuardTotalService guardTotalService;
private GuardTotalService guardTotalService;
public CallResp call(CallReq callReq){
Long userId = LoginHelper.getUserId();

View File

@@ -4,7 +4,7 @@ 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.GuardLog;
import com.ruoyi.cai.service.CaiGuardLogService;
import com.ruoyi.cai.service.GuardLogService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/guardLog")
public class CaiGuardLogController extends BaseController {
private final CaiGuardLogService iCaiGuardLogService;
private final GuardLogService iGuardLogService;
/**
* 查询守护赠送流水列表
@@ -42,7 +42,7 @@ public class CaiGuardLogController extends BaseController {
@SaCheckPermission("cai:guardLog:list")
@GetMapping("/list")
public TableDataInfo<GuardLog> list(GuardLog bo, PageQuery pageQuery) {
Page<GuardLog> page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<GuardLog> page = iGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class CaiGuardLogController extends BaseController {
@GetMapping("/{id}")
public R<GuardLog> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iCaiGuardLogService.getById(id));
return R.ok(iGuardLogService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class CaiGuardLogController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody GuardLog bo) {
return toAjax(iCaiGuardLogService.save(bo));
return toAjax(iGuardLogService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class CaiGuardLogController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody GuardLog bo) {
return toAjax(iCaiGuardLogService.updateById(bo));
return toAjax(iGuardLogService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class CaiGuardLogController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iCaiGuardLogService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(iGuardLogService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.AccountBankcard;
import com.ruoyi.cai.service.CaiAccountBankcardService;
import com.ruoyi.cai.service.AccountBankcardService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/accountBankcard")
public class AccountBankcardController extends BaseController {
private final CaiAccountBankcardService accountBankcardService;
private final AccountBankcardService accountBankcardService;
/**
* 查询用户银行卡列表

View File

@@ -4,7 +4,7 @@ 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.AccountBusiness;
import com.ruoyi.cai.service.CaiAccountBusinessService;
import com.ruoyi.cai.service.AccountBusinessService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/accountBusiness")
public class AccountBusinessController extends BaseController {
private final CaiAccountBusinessService caiAccountBusinessService;
private final AccountBusinessService accountBusinessService;
/**
* 查询账户业务列表
@@ -42,7 +42,7 @@ public class AccountBusinessController extends BaseController {
@SaCheckPermission("cai:accountBusiness:list")
@GetMapping("/list")
public TableDataInfo<AccountBusiness> list(AccountBusiness bo, PageQuery pageQuery) {
Page<AccountBusiness> page = caiAccountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<AccountBusiness> page = accountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class AccountBusinessController extends BaseController {
@GetMapping("/{id}")
public R<AccountBusiness> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiAccountBusinessService.getById(id));
return R.ok(accountBusinessService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class AccountBusinessController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountBusiness bo) {
return toAjax(caiAccountBusinessService.save(bo));
return toAjax(accountBusinessService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class AccountBusinessController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountBusiness bo) {
return toAjax(caiAccountBusinessService.updateById(bo));
return toAjax(accountBusinessService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class AccountBusinessController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiAccountBusinessService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(accountBusinessService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.AccountCash;
import com.ruoyi.cai.dto.admin.vo.AccountCashAdminVo;
import com.ruoyi.cai.service.CaiAccountCashService;
import com.ruoyi.cai.service.AccountCashService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -38,7 +38,7 @@ import java.util.List;
@RequestMapping("/cai/accountCash")
public class AccountCashController extends BaseController {
private final CaiAccountCashService accountCashService;
private final AccountCashService accountCashService;
/**
* 查询用户提现记录列表

View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.Account;
import com.ruoyi.cai.dto.admin.vo.AccountAdminVo;
import com.ruoyi.cai.service.CaiAccountService;
import com.ruoyi.cai.service.AccountService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/account")
public class AccountController extends BaseController {
private final CaiAccountService accountService;
private final AccountService accountService;
/**
* 查询用户账户列表

View File

@@ -4,7 +4,7 @@ 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.AccountDetail;
import com.ruoyi.cai.service.CaiAccountDetailService;
import com.ruoyi.cai.service.AccountDetailService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/accountDetail")
public class AccountDetailController extends BaseController {
private final CaiAccountDetailService caiAccountDetailService;
private final AccountDetailService caiAccountDetailService;
/**
* 查询账户明细列表

View File

@@ -4,7 +4,7 @@ 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.AccountRecharge;
import com.ruoyi.cai.service.CaiAccountRechargeService;
import com.ruoyi.cai.service.AccountRechargeService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/accountRecharge")
public class AccountRechargeController extends BaseController {
private final CaiAccountRechargeService caiAccountRechargeService;
private final AccountRechargeService accountRechargeService;
/**
* 查询充值记录列表
@@ -42,7 +42,7 @@ public class AccountRechargeController extends BaseController {
@SaCheckPermission("cai:accountRecharge:list")
@GetMapping("/list")
public TableDataInfo<AccountRecharge> list(AccountRecharge bo, PageQuery pageQuery) {
Page<AccountRecharge> page = caiAccountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<AccountRecharge> page = accountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class AccountRechargeController extends BaseController {
@GetMapping("/{id}")
public R<AccountRecharge> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiAccountRechargeService.getById(id));
return R.ok(accountRechargeService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class AccountRechargeController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountRecharge bo) {
return toAjax(caiAccountRechargeService.save(bo));
return toAjax(accountRechargeService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class AccountRechargeController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountRecharge bo) {
return toAjax(caiAccountRechargeService.updateById(bo));
return toAjax(accountRechargeService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class AccountRechargeController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiAccountRechargeService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(accountRechargeService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.AnchorApply;
import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo;
import com.ruoyi.cai.service.CaiAnchorApplyService;
import com.ruoyi.cai.service.AnchorApplyService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/anchorApply")
public class AnchorApplyController extends BaseController {
private final CaiAnchorApplyService anchorApplyService;
private final AnchorApplyService anchorApplyService;
/**
* 查询播主申请管理列表

View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.cai.domain.Anchor;
import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
import com.ruoyi.cai.service.CaiAnchorService;
import com.ruoyi.cai.service.AnchorService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/anchor")
public class AnchorController extends BaseController {
private final CaiAnchorService caiAnchorService;
private final AnchorService caiAnchorService;
/**
* 查询女神列表列表

View File

@@ -4,7 +4,7 @@ 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.Banner;
import com.ruoyi.cai.service.CaiBannerService;
import com.ruoyi.cai.service.BannerService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/banner")
public class BannerController extends BaseController {
private final CaiBannerService bannerService;
private final BannerService bannerService;
/**
* 查询轮播列表

View File

@@ -4,7 +4,7 @@ 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.CaiConsumeLog;
import com.ruoyi.cai.service.CaiConsumeLogService;
import com.ruoyi.cai.service.ConsumeLogService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/consumeLog")
public class ConsumeLogController extends BaseController {
private final CaiConsumeLogService caiConsumeLogService;
private final ConsumeLogService consumeLogService;
/**
* 查询消费记录列表
@@ -42,7 +42,7 @@ public class ConsumeLogController extends BaseController {
@SaCheckPermission("cai:consumeLog:list")
@GetMapping("/list")
public TableDataInfo<CaiConsumeLog> list(CaiConsumeLog bo, PageQuery pageQuery) {
Page<CaiConsumeLog> page = caiConsumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<CaiConsumeLog> page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class ConsumeLogController extends BaseController {
@GetMapping("/{id}")
public R<CaiConsumeLog> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiConsumeLogService.getById(id));
return R.ok(consumeLogService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class ConsumeLogController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiConsumeLog bo) {
return toAjax(caiConsumeLogService.save(bo));
return toAjax(consumeLogService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class ConsumeLogController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiConsumeLog bo) {
return toAjax(caiConsumeLogService.updateById(bo));
return toAjax(consumeLogService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class ConsumeLogController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiConsumeLogService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(consumeLogService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.Dynamic;
import com.ruoyi.cai.service.CaiDynamicService;
import com.ruoyi.cai.service.DynamicService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/dynamic")
public class DynamicController extends BaseController {
private final CaiDynamicService caiDynamicService;
private final DynamicService caiDynamicService;
/**
* 查询主播动态列表

View File

@@ -4,7 +4,7 @@ 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.Gift;
import com.ruoyi.cai.service.CaiGiftService;
import com.ruoyi.cai.service.GiftService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/gift")
public class GiftController extends BaseController {
private final CaiGiftService caiGiftService;
private final GiftService giftService;
/**
* 查询礼物列表
@@ -42,7 +42,7 @@ public class GiftController extends BaseController {
@SaCheckPermission("cai:gift:list")
@GetMapping("/list")
public TableDataInfo<Gift> list(Gift bo, PageQuery pageQuery) {
Page<Gift> page = caiGiftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<Gift> page = giftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class GiftController extends BaseController {
@GetMapping("/{id}")
public R<Gift> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(caiGiftService.getById(id));
return R.ok(giftService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class GiftController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody Gift bo) {
return toAjax(caiGiftService.save(bo));
return toAjax(giftService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class GiftController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody Gift bo) {
return toAjax(caiGiftService.updateById(bo));
return toAjax(giftService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class GiftController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(caiGiftService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(giftService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.GiveLog;
import com.ruoyi.cai.service.CaiGiveLogService;
import com.ruoyi.cai.service.GiveLogService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/giveLog")
public class GiveLogController extends BaseController {
private final CaiGiveLogService caiGiveLogService;
private final GiveLogService giveLogService;
/**
* 查询赠送记录列表
@@ -42,7 +42,7 @@ public class GiveLogController extends BaseController {
@SaCheckPermission("cai:giveLog:list")
@GetMapping("/list")
public TableDataInfo<GiveLog> list(GiveLog bo, PageQuery pageQuery) {
Page<GiveLog> page = caiGiveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<GiveLog> page = giveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class GiveLogController extends BaseController {
@GetMapping("/{id}")
public R<GiveLog> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiGiveLogService.getById(id));
return R.ok(giveLogService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class GiveLogController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody GiveLog bo) {
return toAjax(caiGiveLogService.save(bo));
return toAjax(giveLogService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class GiveLogController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody GiveLog bo) {
return toAjax(caiGiveLogService.updateById(bo));
return toAjax(giveLogService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class GiveLogController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiGiveLogService.removeBatchByIds(Arrays.asList(ids)));
return toAjax(giveLogService.removeBatchByIds(Arrays.asList(ids)));
}
}

View File

@@ -4,7 +4,7 @@ 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.Goods;
import com.ruoyi.cai.service.CaiGoodsService;
import com.ruoyi.cai.service.GoodsService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/goods")
public class GoodsController extends BaseController {
private final CaiGoodsService caiGoodsService;
private final GoodsService goodsService;
/**
* 查询充值配置列表
@@ -42,7 +42,7 @@ public class GoodsController extends BaseController {
@SaCheckPermission("cai:goods:list")
@GetMapping("/list")
public TableDataInfo<Goods> list(Goods bo, PageQuery pageQuery) {
Page<Goods> page = caiGoodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<Goods> page = goodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class GoodsController extends BaseController {
@GetMapping("/{id}")
public R<Goods> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiGoodsService.getById(id));
return R.ok(goodsService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class GoodsController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody Goods bo) {
return toAjax(caiGoodsService.save(bo));
return toAjax(goodsService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class GoodsController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody Goods bo) {
return toAjax(caiGoodsService.updateById(bo));
return toAjax(goodsService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class GoodsController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiGoodsService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(goodsService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.LowHeightRisk;
import com.ruoyi.cai.dto.admin.vo.LowHeightRiskAdminVo;
import com.ruoyi.cai.service.CaiLowHeightRiskService;
import com.ruoyi.cai.service.LowHeightRiskService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/lowHeightRisk")
public class LowHeightRiskController extends BaseController {
private final CaiLowHeightRiskService lowHeightRiskService;
private final LowHeightRiskService lowHeightRiskService;
/**
* 查询高风险用户记录列表

View File

@@ -4,7 +4,7 @@ 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.ReportCate;
import com.ruoyi.cai.service.CaiReportCateService;
import com.ruoyi.cai.service.ReportCateService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/reportCate")
public class ReportCateController extends BaseController {
private final CaiReportCateService caiReportCateService;
private final ReportCateService reportCateService;
/**
* 查询举报分类列表
@@ -42,7 +42,7 @@ public class ReportCateController extends BaseController {
@SaCheckPermission("cai:reportCate:list")
@GetMapping("/list")
public TableDataInfo<ReportCate> list(ReportCate bo, PageQuery pageQuery) {
Page<ReportCate> page = caiReportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<ReportCate> page = reportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -56,7 +56,7 @@ public class ReportCateController extends BaseController {
@GetMapping("/{id}")
public R<ReportCate> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(caiReportCateService.getById(id));
return R.ok(reportCateService.getById(id));
}
/**
@@ -67,7 +67,7 @@ public class ReportCateController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ReportCate bo) {
return toAjax(caiReportCateService.save(bo));
return toAjax(reportCateService.save(bo));
}
/**
@@ -78,7 +78,7 @@ public class ReportCateController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ReportCate bo) {
return toAjax(caiReportCateService.updateById(bo));
return toAjax(reportCateService.updateById(bo));
}
/**
@@ -91,6 +91,6 @@ public class ReportCateController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(caiReportCateService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(reportCateService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.Report;
import com.ruoyi.cai.service.CaiReportService;
import com.ruoyi.cai.service.ReportService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/report")
public class ReportController extends BaseController {
private final CaiReportService caiReportService;
private final ReportService reportService;
/**
* 查询举报列表
@@ -42,7 +42,7 @@ public class ReportController extends BaseController {
@SaCheckPermission("cai:report:list")
@GetMapping("/list")
public TableDataInfo<Report> list(Report bo, PageQuery pageQuery) {
Page<Report> page = caiReportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<Report> page = reportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class ReportController extends BaseController {
@GetMapping("/{id}")
public R<Report> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiReportService.getById(id));
return R.ok(reportService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class ReportController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody Report bo) {
return toAjax(caiReportService.save(bo));
return toAjax(reportService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class ReportController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody Report bo) {
return toAjax(caiReportService.updateById(bo));
return toAjax(reportService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class ReportController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiReportService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(reportService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.Union;
import com.ruoyi.cai.dto.admin.vo.UnionAdminVo;
import com.ruoyi.cai.service.CaiUnionService;
import com.ruoyi.cai.service.UnionService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userUnion")
public class UnionController extends BaseController {
private final CaiUnionService caiUnionService;
private final UnionService unionService;
/**
* 查询工会列表列表
@@ -42,7 +42,7 @@ public class UnionController extends BaseController {
@SaCheckPermission("cai:userUnion:list")
@GetMapping("/list")
public TableDataInfo<UnionAdminVo> list(UnionAdminVo bo, PageQuery pageQuery) {
Page<UnionAdminVo> page = caiUnionService.pageAdmin(pageQuery, bo);
Page<UnionAdminVo> page = unionService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}
@@ -56,7 +56,7 @@ public class UnionController extends BaseController {
@GetMapping("/{id}")
public R<Union> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiUnionService.getById(id));
return R.ok(unionService.getById(id));
}
/**
@@ -67,7 +67,7 @@ public class UnionController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody Union bo) {
return toAjax(caiUnionService.save(bo));
return toAjax(unionService.save(bo));
}
/**
@@ -78,7 +78,7 @@ public class UnionController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody Union bo) {
return toAjax(caiUnionService.updateById(bo));
return toAjax(unionService.updateById(bo));
}
/**
@@ -91,6 +91,6 @@ public class UnionController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiUnionService.removeBatchByIds(Arrays.asList(ids)));
return toAjax(unionService.removeBatchByIds(Arrays.asList(ids)));
}
}

View File

@@ -1,11 +1,10 @@
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.UnionUser;
import com.ruoyi.cai.dto.admin.vo.UnionUserAdminVo;
import com.ruoyi.cai.service.CaiUnionUserService;
import com.ruoyi.cai.service.UnionUserService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -35,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/unionUser")
public class UnionUserController extends BaseController {
private final CaiUnionUserService caiUnionUserService;
private final UnionUserService unionUserService;
/**
* 查询123列表
@@ -43,7 +42,7 @@ public class UnionUserController extends BaseController {
@SaCheckPermission("cai:unionUser:list")
@GetMapping("/list")
public TableDataInfo<UnionUserAdminVo> list(UnionUserAdminVo bo, PageQuery pageQuery) {
Page<UnionUserAdminVo> page = caiUnionUserService.pageAdmin(pageQuery, bo);
Page<UnionUserAdminVo> page = unionUserService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}
@@ -56,7 +55,7 @@ public class UnionUserController extends BaseController {
@GetMapping("/{id}")
public R<UnionUser> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiUnionUserService.getById(id));
return R.ok(unionUserService.getById(id));
}
/**
@@ -67,7 +66,7 @@ public class UnionUserController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UnionUser bo) {
return toAjax(caiUnionUserService.save(bo));
return toAjax(unionUserService.save(bo));
}
/**
@@ -78,7 +77,7 @@ public class UnionUserController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UnionUser bo) {
return toAjax(caiUnionUserService.updateById(bo));
return toAjax(unionUserService.updateById(bo));
}
/**
@@ -91,6 +90,6 @@ public class UnionUserController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiUnionUserService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(unionUserService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.UserAlbum;
import com.ruoyi.cai.service.CaiUserAlbumService;
import com.ruoyi.cai.service.UserAlbumService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userAlbum")
public class UserAlbumController extends BaseController {
private final CaiUserAlbumService userAlbumService;
private final UserAlbumService userAlbumService;
/**
* 查询主播集锦列表

View File

@@ -4,7 +4,7 @@ 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.UserCall;
import com.ruoyi.cai.service.CaiUserCallService;
import com.ruoyi.cai.service.UserCallService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userCall")
public class UserCallController extends BaseController {
private final CaiUserCallService caiUserCallService;
private final UserCallService userCallService;
/**
* 查询通话记录列表
@@ -42,7 +42,7 @@ public class UserCallController extends BaseController {
@SaCheckPermission("cai:userCall:list")
@GetMapping("/list")
public TableDataInfo<UserCall> list(UserCall bo, PageQuery pageQuery) {
Page<UserCall> page = caiUserCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserCall> page = userCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class UserCallController extends BaseController {
@GetMapping("/{id}")
public R<UserCall> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiUserCallService.getById(id));
return R.ok(userCallService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class UserCallController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCall bo) {
return toAjax(caiUserCallService.save(bo));
return toAjax(userCallService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class UserCallController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCall bo) {
return toAjax(caiUserCallService.updateById(bo));
return toAjax(userCallService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class UserCallController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiUserCallService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(userCallService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.UserCameraAudit;
import com.ruoyi.cai.service.CaiUserCameraAuditService;
import com.ruoyi.cai.service.UserCameraAuditService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userCameraAudit")
public class UserCameraAuditController extends BaseController {
private final CaiUserCameraAuditService caiUserCameraAuditService;
private final UserCameraAuditService userCameraAuditService;
/**
* 查询自拍认证列表
@@ -42,7 +42,7 @@ public class UserCameraAuditController extends BaseController {
@SaCheckPermission("cai:userCameraAudit:list")
@GetMapping("/list")
public TableDataInfo<UserCameraAudit> list(UserCameraAudit bo, PageQuery pageQuery) {
Page<UserCameraAudit> page = caiUserCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserCameraAudit> page = userCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class UserCameraAuditController extends BaseController {
@GetMapping("/{id}")
public R<UserCameraAudit> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(caiUserCameraAuditService.getById(id));
return R.ok(userCameraAuditService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class UserCameraAuditController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCameraAudit bo) {
return toAjax(caiUserCameraAuditService.save(bo));
return toAjax(userCameraAuditService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class UserCameraAuditController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCameraAudit bo) {
return toAjax(caiUserCameraAuditService.updateById(bo));
return toAjax(userCameraAuditService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class UserCameraAuditController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(caiUserCameraAuditService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(userCameraAuditService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -5,8 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
import com.ruoyi.cai.manager.UserAdminManager;
import com.ruoyi.cai.service.CaiUserService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -36,7 +37,7 @@ import java.util.Arrays;
@RequestMapping("/cai/user")
public class UserController extends BaseController {
private final CaiUserService caiUserService;
private final UserService userService;
private final UserAdminManager userAdminManager;
/**
@@ -45,7 +46,7 @@ public class UserController extends BaseController {
@SaCheckPermission("cai:user:list")
@GetMapping("/list")
public TableDataInfo<UserAdminVo> list(User query, PageQuery pageQuery) {
Page<UserAdminVo> result = caiUserService.pageAdmin(pageQuery, query);
Page<UserAdminVo> result = userService.pageAdmin(pageQuery, query);
return TableDataInfo.build(result);
}
@@ -56,8 +57,14 @@ public class UserController extends BaseController {
*/
@SaCheckPermission("cai:user:query")
@GetMapping("/{id}")
public R<User> getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) {
return R.ok(caiUserService.getById(id));
public R<User> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
return R.ok(userService.getById(id));
}
@SaCheckPermission("cai:user:query")
@GetMapping("/full/{id}")
public R<UserFullAdminVo> getFullUser(@NotNull(message = "主键不能为空") @PathVariable Long id) {
return R.ok(userAdminManager.getUser(id));
}
/**
@@ -68,7 +75,7 @@ public class UserController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody User bo) {
return toAjax(caiUserService.save(bo));
return toAjax(userService.save(bo));
}
/**
@@ -92,6 +99,6 @@ public class UserController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(caiUserService.removeBatchByIds(Arrays.asList(ids)));
return toAjax(userService.removeBatchByIds(Arrays.asList(ids)));
}
}

View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.UserCount;
import com.ruoyi.cai.dto.admin.vo.UserCountAdminVo;
import com.ruoyi.cai.service.CaiUserCountService;
import com.ruoyi.cai.service.UserCountService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userCount")
public class UserCountController extends BaseController {
private final CaiUserCountService caiUserCountService;
private final UserCountService userCountService;
/**
* 查询用户信息数量统计列表
@@ -42,13 +42,13 @@ public class UserCountController extends BaseController {
@SaCheckPermission("cai:userCount:list")
@GetMapping("/list")
public TableDataInfo<UserCountAdminVo> list(UserCountAdminVo bo, PageQuery pageQuery) {
Page<UserCountAdminVo> page = caiUserCountService.pageAdmin(pageQuery, bo);
Page<UserCountAdminVo> page = userCountService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}
@GetMapping("/reset")
public R<Void> reset(Long userId) {
caiUserCountService.reset(userId);
userCountService.reset(userId);
return R.ok();
}
@@ -62,7 +62,7 @@ public class UserCountController extends BaseController {
@GetMapping("/{userId}")
public R<UserCount> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer userId) {
return R.ok(caiUserCountService.getById(userId));
return R.ok(userCountService.getById(userId));
}
/**
@@ -73,7 +73,7 @@ public class UserCountController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCount bo) {
return toAjax(caiUserCountService.save(bo));
return toAjax(userCountService.save(bo));
}
/**
@@ -84,7 +84,7 @@ public class UserCountController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCount bo) {
return toAjax(caiUserCountService.updateById(bo));
return toAjax(userCountService.updateById(bo));
}
/**
@@ -97,6 +97,6 @@ public class UserCountController extends BaseController {
@DeleteMapping("/{userIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] userIds) {
return toAjax(caiUserCountService.removeBatchByIds(Arrays.asList(userIds), true));
return toAjax(userCountService.removeBatchByIds(Arrays.asList(userIds), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.UserForbid;
import com.ruoyi.cai.service.CaiUserForbidService;
import com.ruoyi.cai.service.UserForbidService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userForbid")
public class UserForbidController extends BaseController {
private final CaiUserForbidService userForbidService;
private final UserForbidService userForbidService;
/**
* 查询封号列表列表

View File

@@ -4,7 +4,7 @@ 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.UserInvite;
import com.ruoyi.cai.service.CaiUserInviteService;
import com.ruoyi.cai.service.UserInviteService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userInvite")
public class UserInviteController extends BaseController {
private final CaiUserInviteService caiUserInviteService;
private final UserInviteService userInviteService;
/**
* 查询用户邀请列表
@@ -42,7 +42,7 @@ public class UserInviteController extends BaseController {
@SaCheckPermission("cai:userInvite:list")
@GetMapping("/list")
public TableDataInfo<UserInvite> list(UserInvite bo, PageQuery pageQuery) {
Page<UserInvite> page = caiUserInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserInvite> page = userInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class UserInviteController extends BaseController {
@GetMapping("/{id}")
public R<UserInvite> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiUserInviteService.getById(id));
return R.ok(userInviteService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class UserInviteController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserInvite bo) {
return toAjax(caiUserInviteService.save(bo));
return toAjax(userInviteService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class UserInviteController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserInvite bo) {
return toAjax(caiUserInviteService.updateById(bo));
return toAjax(userInviteService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class UserInviteController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiUserInviteService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(userInviteService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.UserMember;
import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
import com.ruoyi.cai.service.CaiUserMemberService;
import com.ruoyi.cai.service.UserMemberService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userMember")
public class UserMemberController extends BaseController {
private final CaiUserMemberService userMemberService;
private final UserMemberService userMemberService;
/**
* 查询会员管理列表

View File

@@ -4,7 +4,7 @@ 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.UserRiskLog;
import com.ruoyi.cai.service.CaiUserRiskLogService;
import com.ruoyi.cai.service.UserRiskLogService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userRiskLog")
public class UserRiskLogController extends BaseController {
private final CaiUserRiskLogService userRiskLogService;
private final UserRiskLogService userRiskLogService;
/**
* 查询高风险操作日志列表

View File

@@ -4,7 +4,7 @@ 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.UserVisitor;
import com.ruoyi.cai.service.CaiUserVisitorService;
import com.ruoyi.cai.service.UserVisitorService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/userVisitor")
public class UserVisitorController extends BaseController {
private final CaiUserVisitorService caiUserVisitorService;
private final UserVisitorService userVisitorService;
/**
* 查询用户来访记录列表
@@ -42,7 +42,7 @@ public class UserVisitorController extends BaseController {
@SaCheckPermission("cai:userVisitor:list")
@GetMapping("/list")
public TableDataInfo<UserVisitor> list(UserVisitor bo, PageQuery pageQuery) {
Page<UserVisitor> page = caiUserVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserVisitor> page = userVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class UserVisitorController extends BaseController {
@GetMapping("/{id}")
public R<UserVisitor> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiUserVisitorService.getById(id));
return R.ok(userVisitorService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class UserVisitorController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserVisitor bo) {
return toAjax(caiUserVisitorService.save(bo));
return toAjax(userVisitorService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class UserVisitorController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserVisitor bo) {
return toAjax(caiUserVisitorService.updateById(bo));
return toAjax(userVisitorService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class UserVisitorController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiUserVisitorService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(userVisitorService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,7 +4,7 @@ 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.WithdrawExchange;
import com.ruoyi.cai.service.CaiWithdrawExchangeService;
import com.ruoyi.cai.service.WithdrawExchangeService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
@RequestMapping("/cai/withdrawExchange")
public class WithdrawExchangeController extends BaseController {
private final CaiWithdrawExchangeService caiWithdrawExchangeService;
private final WithdrawExchangeService withdrawExchangeService;
/**
* 查询提现 - 兑换配置列表
@@ -42,7 +42,7 @@ public class WithdrawExchangeController extends BaseController {
@SaCheckPermission("cai:withdrawExchange:list")
@GetMapping("/list")
public TableDataInfo<WithdrawExchange> list(WithdrawExchange bo, PageQuery pageQuery) {
Page<WithdrawExchange> page = caiWithdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<WithdrawExchange> page = withdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
@@ -55,7 +55,7 @@ public class WithdrawExchangeController extends BaseController {
@GetMapping("/{id}")
public R<WithdrawExchange> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiWithdrawExchangeService.getById(id));
return R.ok(withdrawExchangeService.getById(id));
}
/**
@@ -66,7 +66,7 @@ public class WithdrawExchangeController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WithdrawExchange bo) {
return toAjax(caiWithdrawExchangeService.save(bo));
return toAjax(withdrawExchangeService.save(bo));
}
/**
@@ -77,7 +77,7 @@ public class WithdrawExchangeController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WithdrawExchange bo) {
return toAjax(caiWithdrawExchangeService.updateById(bo));
return toAjax(withdrawExchangeService.updateById(bo));
}
/**
@@ -90,6 +90,6 @@ public class WithdrawExchangeController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiWithdrawExchangeService.removeBatchByIds(Arrays.asList(ids), true));
return toAjax(withdrawExchangeService.removeBatchByIds(Arrays.asList(ids), true));
}
}

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 = "快速获取当前用户账号余额信息")

View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -79,7 +80,7 @@ public class User implements Serializable {
/**
*
*/
private LocalDateTime birthday;
private LocalDate birthday;
/**
* 城市
*/

View File

@@ -0,0 +1,19 @@
package com.ruoyi.cai.dto.admin.vo;
import com.ruoyi.cai.domain.*;
import lombok.Data;
import java.util.List;
@Data
public class UserFullAdminVo {
private User user;
private UserInfo userInfo;
private Account account;
private Anchor anchor;
private Union union;
private UserOnline userOnline;
private UserCount userCount;
private List<UserAlbum> userAlbums;
private UserMember userMember;
}

View File

@@ -22,17 +22,17 @@ import java.util.List;
@Component
public class CurrentUserManager {
@Autowired
private CaiUserService userService;
private UserService userService;
@Autowired
private CaiAnchorService anchorService;
private AnchorService anchorService;
@Autowired
private CaiUserCountService userCountService;
private UserCountService userCountService;
@Autowired
private CaiUserAlbumService userAlbumService;
private UserAlbumService userAlbumService;
@Autowired
private CaiAccountService accountService;
private AccountService accountService;
@Autowired
private CaiAccountBankcardService accountBankcardService;
private AccountBankcardService accountBankcardService;
public CurrentUserInfoVo currentInfo() {
Long userId = LoginHelper.getUserId();

View File

@@ -2,8 +2,11 @@ package com.ruoyi.cai.manager;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.domain.UserCount;
import com.ruoyi.cai.domain.UserOnline;
import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
import com.ruoyi.cai.service.CaiUserService;
import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
import com.ruoyi.cai.service.*;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +15,7 @@ import org.springframework.stereotype.Component;
@Component
public class UserAdminManager {
@Autowired
private CaiUserService userService;
private UserService userService;
public boolean updateUser(UserUpdateAdminReq userUpdateAdmin){
User user = userService.getById(userUpdateAdmin.getId());
@@ -38,4 +41,35 @@ public class UserAdminManager {
userService.updateById(update);
return true;
}
@Autowired
private UserInfoService userInfoService;
@Autowired
private AccountService accountService;
@Autowired
private AnchorService anchorService;
@Autowired
private UnionService unionService;
@Autowired
private UserOnlineService userOnlineService;
@Autowired
private UserCountService userCountService;
@Autowired
private UserAlbumService userAlbumService;
@Autowired
private UserMemberService userMemberService;
public UserFullAdminVo getUser(Long id) {
UserFullAdminVo vo = new UserFullAdminVo();
vo.setUser(userService.getById(id));
vo.setUserInfo(userInfoService.getByUserId(id));
vo.setAccount(accountService.getByUserId(id));
vo.setAnchor(anchorService.getByUserId(id));
vo.setUnion(unionService.getByUserId(id));
vo.setUserOnline(userOnlineService.getByUserId(id));
vo.setUserCount(userCountService.getByUserId(id));
vo.setUserAlbums(userAlbumService.listByUserId(id));
vo.setUserMember(userMemberService.getByUserId(id));
return vo;
}
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBankcard;
* @author 77
* @date 2023-12-21
*/
public interface CaiAccountBankcardMapper extends BaseMapper<AccountBankcard> {
public interface AccountBankcardMapper extends BaseMapper<AccountBankcard> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBusiness;
* @author 77
* @date 2023-12-22
*/
public interface CaiAccountBusinessMapper extends BaseMapper<AccountBusiness> {
public interface AccountBusinessMapper extends BaseMapper<AccountBusiness> {
}

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-21
*/
public interface CaiAccountCashMapper extends BaseMapper<AccountCash> {
public interface AccountCashMapper extends BaseMapper<AccountCash> {
Page<AccountCashAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AccountCashAdminVo bo);
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountDetail;
* @author 77
* @date 2023-12-22
*/
public interface CaiAccountDetailMapper extends BaseMapper<AccountDetail> {
public interface AccountDetailMapper extends BaseMapper<AccountDetail> {
}

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-23
*/
public interface CaiAccountMapper extends BaseMapper<Account> {
public interface AccountMapper extends BaseMapper<Account> {
long decrCoin(@Param("userId") Long userId, @Param("coin") Long coin);

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountRecharge;
* @author 77
* @date 2023-12-22
*/
public interface CaiAccountRechargeMapper extends BaseMapper<AccountRecharge> {
public interface AccountRechargeMapper extends BaseMapper<AccountRecharge> {
}

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-22
*/
public interface CaiAnchorApplyMapper extends BaseMapper<AnchorApply> {
public interface AnchorApplyMapper extends BaseMapper<AnchorApply> {
Page<AnchorApplyAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AnchorApplyAdminVo bo);
}

View File

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-22
*/
public interface CaiAnchorMapper extends BaseMapper<Anchor> {
public interface AnchorMapper extends BaseMapper<Anchor> {
Page<AnchorAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AnchorAdminVo bo);

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Area;
* @author 77
* @date 2023-12-23
*/
public interface CaiAreaMapper extends BaseMapper<Area> {
public interface AreaMapper extends BaseMapper<Area> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Banner;
* @author 77
* @date 2023-12-21
*/
public interface CaiBannerMapper extends BaseMapper<Banner> {
public interface BannerMapper extends BaseMapper<Banner> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Citys;
* @author 77
* @date 2023-12-30
*/
public interface CaiCitysMapper extends BaseMapper<Citys> {
public interface CitysMapper extends BaseMapper<Citys> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiConsumeLog;
* @author 77
* @date 2023-12-24
*/
public interface CaiConsumeLogMapper extends BaseMapper<CaiConsumeLog> {
public interface ConsumeLogMapper extends BaseMapper<CaiConsumeLog> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.DynamicImages;
* @author 77
* @date 2023-12-23
*/
public interface CaiDynamicImagesMapper extends BaseMapper<DynamicImages> {
public interface DynamicImagesMapper extends BaseMapper<DynamicImages> {
}

View File

@@ -15,7 +15,7 @@ import java.util.List;
* @author 77
* @date 2023-12-23
*/
public interface CaiDynamicMapper extends BaseMapper<Dynamic> {
public interface DynamicMapper extends BaseMapper<Dynamic> {
Page<DynamicListVo> pageApp(@Param("build") Page<Object> build, @Param("query") DynamicQuery query);

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Gift;
* @author 77
* @date 2023-12-23
*/
public interface CaiGiftMapper extends BaseMapper<Gift> {
public interface GiftMapper extends BaseMapper<Gift> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.GiveLog;
* @author 77
* @date 2023-12-24
*/
public interface CaiGiveLogMapper extends BaseMapper<GiveLog> {
public interface GiveLogMapper extends BaseMapper<GiveLog> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Goods;
* @author 77
* @date 2023-12-24
*/
public interface CaiGoodsMapper extends BaseMapper<Goods> {
public interface GoodsMapper extends BaseMapper<Goods> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.GuardLog;
* @author 77
* @date 2023-12-30
*/
public interface CaiGuardLogMapper extends BaseMapper<GuardLog> {
public interface GuardLogMapper extends BaseMapper<GuardLog> {
}

View File

@@ -15,7 +15,7 @@ import java.util.List;
* @author 77
* @date 2023-12-23
*/
public interface CaiGuardTotalMapper extends BaseMapper<GuardTotal> {
public interface GuardTotalMapper extends BaseMapper<GuardTotal> {
List<GuardTotalDTO> selectGuardTotal(@Param("fromUserId") Long fromUserId, @Param("limit") Integer limit);

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-22
*/
public interface CaiLowHeightRiskMapper extends BaseMapper<LowHeightRisk> {
public interface LowHeightRiskMapper extends BaseMapper<LowHeightRisk> {
Page<LowHeightRiskAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") LowHeightRiskAdminVo bo);
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.MemberSkill;
* @author 77
* @date 2023-12-30
*/
public interface CaiMemberSkillMapper extends BaseMapper<MemberSkill> {
public interface MemberSkillMapper extends BaseMapper<MemberSkill> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.ReportCate;
* @author 77
* @date 2023-12-24
*/
public interface CaiReportCateMapper extends BaseMapper<ReportCate> {
public interface ReportCateMapper extends BaseMapper<ReportCate> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Report;
* @author 77
* @date 2023-12-24
*/
public interface CaiReportMapper extends BaseMapper<Report> {
public interface ReportMapper extends BaseMapper<Report> {
}

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-22
*/
public interface CaiUnionMapper extends BaseMapper<Union> {
public interface UnionMapper extends BaseMapper<Union> {
Page<UnionAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UnionAdminVo bo);

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author ruoyi
* @date 2023-12-22
*/
public interface CaiUnionUserMapper extends BaseMapper<UnionUser> {
public interface UnionUserMapper extends BaseMapper<UnionUser> {
Page<UnionUserAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UnionUserAdminVo bo);
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserAlbum;
* @author ruoyi
* @date 2023-12-23
*/
public interface CaiUserAlbumMapper extends BaseMapper<UserAlbum> {
public interface UserAlbumMapper extends BaseMapper<UserAlbum> {
}

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-30
*/
public interface CaiUserBlacklistMapper extends BaseMapper<UserBlacklist> {
public interface UserBlacklistMapper extends BaseMapper<UserBlacklist> {
Page<UserListVo> pageApp(@Param("build") Page<Object> build, @Param("userId") Long userId);
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserCall;
* @author 77
* @date 2023-12-27
*/
public interface CaiUserCallMapper extends BaseMapper<UserCall> {
public interface UserCallMapper extends BaseMapper<UserCall> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserCameraAudit;
* @author 77
* @date 2023-12-30
*/
public interface CaiUserCameraAuditMapper extends BaseMapper<UserCameraAudit> {
public interface UserCameraAuditMapper extends BaseMapper<UserCameraAudit> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserCodeGen;
* @author 77
* @date 2023-12-21
*/
public interface CaiUserCodeGenMapper extends BaseMapper<UserCodeGen> {
public interface UserCodeGenMapper extends BaseMapper<UserCodeGen> {
}

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-24
*/
public interface CaiUserCountMapper extends BaseMapper<UserCount> {
public interface UserCountMapper extends BaseMapper<UserCount> {
void starIncs(@Param("userId") Long userId, @Param("fansIncs") int fansIncs, @Param("followIncs") int followIncs);

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserFollowDynamic;
* @author 77
* @date 2023-12-23
*/
public interface CaiUserFollowDynamicMapper extends BaseMapper<UserFollowDynamic> {
public interface UserFollowDynamicMapper extends BaseMapper<UserFollowDynamic> {
}

View File

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-23
*/
public interface CaiUserFollowMapper extends BaseMapper<UserFollow> {
public interface UserFollowMapper extends BaseMapper<UserFollow> {
Page<UserStarOrVisitorList> pageApp(@Param("build") Page<Object> build, @Param("query") StarQuery query);
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserForbid;
* @author 77
* @date 2023-12-21
*/
public interface CaiUserForbidMapper extends BaseMapper<UserForbid> {
public interface UserForbidMapper extends BaseMapper<UserForbid> {
}

View File

@@ -13,7 +13,7 @@ import java.util.List;
* @author 77
* @date 2023-12-23
*/
public interface CaiUserGiftMapper extends BaseMapper<UserGift> {
public interface UserGiftMapper extends BaseMapper<UserGift> {
List<UserGiftIndexVo> selectGiftList(@Param("userId") Long userId);

View File

@@ -3,5 +3,5 @@ package com.ruoyi.cai.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.cai.domain.UserInfo;
public interface CaiUserInfoMapper extends BaseMapper<UserInfo> {
public interface UserInfoMapper extends BaseMapper<UserInfo> {
}

View File

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-28
*/
public interface CaiUserInviteMapper extends BaseMapper<UserInvite> {
public interface UserInviteMapper extends BaseMapper<UserInvite> {
InviteCountDTO countInviteAndReward(@Param("userId") Long userId);

View File

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-19
*/
public interface CaiUserMapper extends BaseMapper<User> {
public interface UserMapper extends BaseMapper<User> {
Page<UserAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("query") User query);

View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-21
*/
public interface CaiUserMemberMapper extends BaseMapper<UserMember> {
public interface UserMemberMapper extends BaseMapper<UserMember> {
Page<UserMemberAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserMemberAdminVo bo);
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserOnline;
* @author 77
* @date 2023-12-23
*/
public interface CaiUserOnlineMapper extends BaseMapper<UserOnline> {
public interface UserOnlineMapper extends BaseMapper<UserOnline> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserRiskLog;
* @author 77
* @date 2023-12-22
*/
public interface CaiUserRiskLogMapper extends BaseMapper<UserRiskLog> {
public interface UserRiskLogMapper extends BaseMapper<UserRiskLog> {
}

View File

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
* @author 77
* @date 2023-12-24
*/
public interface CaiUserVisitorMapper extends BaseMapper<UserVisitor> {
public interface UserVisitorMapper extends BaseMapper<UserVisitor> {
Page<UserStarOrVisitorList> pageApp(@Param("build") Page<Object> build, @Param("query") VisitorQuery query);
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.WithdrawExchange;
* @author 77
* @date 2023-12-24
*/
public interface CaiWithdrawExchangeMapper extends BaseMapper<WithdrawExchange> {
public interface WithdrawExchangeMapper extends BaseMapper<WithdrawExchange> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBankcard;
* @author 77
* @date 2023-12-21
*/
public interface CaiAccountBankcardService extends IService<AccountBankcard> {
public interface AccountBankcardService extends IService<AccountBankcard> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBusiness;
* @author 77
* @date 2023-12-22
*/
public interface CaiAccountBusinessService extends IService<AccountBusiness> {
public interface AccountBusinessService extends IService<AccountBusiness> {
}

View File

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.PageQuery;
* @author 77
* @date 2023-12-21
*/
public interface CaiAccountCashService extends IService<AccountCash> {
public interface AccountCashService extends IService<AccountCash> {
void withdraw(WithdrawReq res);

View File

@@ -9,7 +9,7 @@ import com.ruoyi.cai.domain.AccountDetail;
* @author 77
* @date 2023-12-22
*/
public interface CaiAccountDetailService extends IService<AccountDetail> {
public interface AccountDetailService extends IService<AccountDetail> {
}

View File

@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountRecharge;
* @author 77
* @date 2023-12-22
*/
public interface CaiAccountRechargeService extends IService<AccountRecharge> {
public interface AccountRechargeService extends IService<AccountRecharge> {
}

View File

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.PageQuery;
* @author 77
* @date 2023-12-23
*/
public interface CaiAccountService extends IService<Account> {
public interface AccountService extends IService<Account> {
Account getByUserId(Long userId);

View File

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.PageQuery;
* @author 77
* @date 2023-12-22
*/
public interface CaiAnchorApplyService extends IService<AnchorApply> {
public interface AnchorApplyService extends IService<AnchorApply> {
AnchorApply getByUserId(Long userId);

Some files were not shown because too many files have changed in this diff Show More