diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/DayIncomeStatisticsController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/DayIncomeStatisticsController.java index 76131a67..b6e68644 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/DayIncomeStatisticsController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/DayIncomeStatisticsController.java @@ -11,17 +11,13 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.time.LocalDate; -import java.util.Arrays; /** * 每日账单统计 @@ -60,7 +56,8 @@ public class DayIncomeStatisticsController extends BaseController { return R.ok(dayIncomeStatisticsService.getById(id)); } - @Log(title = "刷新单天统计", businessType = BusinessType.INSERT) + @SaCheckPermission("cai:dayIncomeStatistics:edit") + @Log(title = "刷新单天统计", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/refreshToday") public R refreshToday() { @@ -68,7 +65,8 @@ public class DayIncomeStatisticsController extends BaseController { return R.ok(); } - @Log(title = "刷新昨日统计", businessType = BusinessType.INSERT) + @SaCheckPermission("cai:dayIncomeStatistics:edit") + @Log(title = "刷新昨日统计", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/refreshLastDay") public R refreshLastDay() { @@ -76,38 +74,4 @@ public class DayIncomeStatisticsController extends BaseController { return R.ok(); } - /** - * 新增每日账单统计 - */ - @SaCheckPermission("cai:dayIncomeStatistics:add") - @Log(title = "每日账单统计", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody DayIncomeStatistics bo) { - return toAjax(dayIncomeStatisticsService.save(bo)); - } - - /** - * 修改每日账单统计 - */ - @SaCheckPermission("cai:dayIncomeStatistics:edit") - @Log(title = "每日账单统计", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody DayIncomeStatistics bo) { - return toAjax(dayIncomeStatisticsService.updateById(bo)); - } - - /** - * 删除每日账单统计 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:dayIncomeStatistics:remove") - @Log(title = "每日账单统计", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(dayIncomeStatisticsService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/PayTotalController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/PayTotalController.java index 40067b76..a31f7042 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/PayTotalController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/PayTotalController.java @@ -1,27 +1,22 @@ package com.ruoyi.cai.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.PayTotal; import com.ruoyi.cai.dto.admin.vo.PayTotalAdminVo; import com.ruoyi.cai.service.PayTotalService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 支付统计 @@ -59,38 +54,4 @@ public class PayTotalController extends BaseController { return R.ok(payTotalService.getById(id)); } - /** - * 新增支付统计 - */ - @SaCheckPermission("cai:payTotal:add") - @Log(title = "支付统计", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody PayTotal bo) { - return toAjax(payTotalService.save(bo)); - } - - /** - * 修改支付统计 - */ - @SaCheckPermission("cai:payTotal:edit") - @Log(title = "支付统计", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody PayTotal bo) { - return toAjax(payTotalService.updateById(bo)); - } - - /** - * 删除支付统计 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:payTotal:remove") - @Log(title = "支付统计", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(payTotalService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserErrorLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserErrorLogController.java index 7e009518..5d006186 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserErrorLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserErrorLogController.java @@ -1,19 +1,15 @@ package com.ruoyi.cai.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.UserErrorLog; import com.ruoyi.cai.dto.admin.vo.UserErrorLogAdminVo; import com.ruoyi.cai.service.UserErrorLogService; import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -59,28 +55,6 @@ public class UserErrorLogController extends BaseController { return R.ok(userErrorLogService.getById(id)); } - /** - * 新增用户异常记录 - */ - @SaCheckPermission("cai:userErrorLog:add") - @Log(title = "用户异常记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserErrorLog bo) { - return toAjax(userErrorLogService.save(bo)); - } - - /** - * 修改用户异常记录 - */ - @SaCheckPermission("cai:userErrorLog:edit") - @Log(title = "用户异常记录", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserErrorLog bo) { - return toAjax(userErrorLogService.updateById(bo)); - } - /** * 删除用户异常记录 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java index 6d578230..c448091e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java @@ -13,8 +13,6 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -23,9 +21,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -81,7 +77,7 @@ public class AccountCashController extends BaseController { return R.ok(accountCashService.getById(id)); } -// @SaCheckPermission("cai:accountCash:edit") + @SaCheckPermission("cai:accountCash:edit") @Log(title = "用户提现通过", businessType = BusinessType.UPDATE) @RepeatSubmit() @GetMapping("/success") @@ -95,6 +91,7 @@ public class AccountCashController extends BaseController { return R.ok(); } + @SaCheckPermission("cai:accountCash:edit") @Log(title = "用户提现不通过", businessType = BusinessType.UPDATE) @RepeatSubmit() @GetMapping("/fail") @@ -104,6 +101,7 @@ public class AccountCashController extends BaseController { } + @SaCheckPermission("cai:accountCash:edit") @Log(title = "用户提现取消", businessType = BusinessType.UPDATE) @RepeatSubmit() @GetMapping("/close") @@ -117,6 +115,7 @@ public class AccountCashController extends BaseController { return R.ok(); } + @SaCheckPermission("cai:accountCash:edit") @Log(title = "用户提现批量通过", businessType = BusinessType.UPDATE) @RepeatSubmit() @GetMapping("/batchSuccess") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java index c63a95a4..0ee9adb2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java @@ -1,26 +1,22 @@ 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.AccountChangeLog; import com.ruoyi.cai.dto.admin.CaiDictVo; import com.ruoyi.cai.enums.account.AccountCateEnum; import com.ruoyi.cai.service.AccountChangeLogService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Arrays; import java.util.List; @@ -73,38 +69,4 @@ public class AccountChangeLogController extends BaseController { return R.ok(accountChangeLogService.getById(id)); } - /** - * 新增账户明细 - */ - @SaCheckPermission("cai:accountChangeLog:add") - @Log(title = "账户明细", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody AccountChangeLog bo) { - return toAjax(accountChangeLogService.save(bo)); - } - - /** - * 修改账户明细 - */ - @SaCheckPermission("cai:accountChangeLog:edit") - @Log(title = "账户明细", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody AccountChangeLog bo) { - return toAjax(accountChangeLogService.updateById(bo)); - } - - /** - * 删除账户明细 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:accountChangeLog:remove") - @Log(title = "账户明细", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(accountChangeLogService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java index 11152348..8ec584b1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java @@ -59,7 +59,7 @@ public class AnchorApplyController extends BaseController { return R.ok(anchorApplyService.getById(id)); } - @SaCheckPermission("cai:anchorApply:audit") + @SaCheckPermission("cai:anchorApply:edit") @Log(title = "播主申请管理", businessType = BusinessType.UPDATE) @PostMapping("/auditAnchorSuccess") public R auditAnchorSuccess(@RequestBody IdRes id) { @@ -67,7 +67,7 @@ public class AnchorApplyController extends BaseController { return R.ok(); } - @SaCheckPermission("cai:anchorApply:audit") + @SaCheckPermission("cai:anchorApply:edit") @Log(title = "播主申请管理", businessType = BusinessType.UPDATE) @PostMapping("/auditAnchorFail") public R auditAnchorFail(@RequestBody IdRes id) { diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java index 7d78578a..5f88e7df 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java @@ -4,7 +4,6 @@ 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.ConsumeLog; -import com.ruoyi.cai.domain.UserGift; import com.ruoyi.cai.service.ConsumeLogService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -12,23 +11,16 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; -/** - * 消费记录 - * - * @author 77 - * @date 2023-12-24 - */ @Validated @RequiredArgsConstructor @RestController @@ -37,9 +29,6 @@ public class ConsumeLogController extends BaseController { private final ConsumeLogService consumeLogService; - /** - * 查询消费记录列表 - */ @SaCheckPermission("cai:consumeLog:list") @GetMapping("/list") public TableDataInfo list(ConsumeLog bo, PageQuery pageQuery) { @@ -48,11 +37,6 @@ public class ConsumeLogController extends BaseController { return TableDataInfo.build(page); } - /** - * 获取消费记录详细信息 - * - * @param id 主键 - */ @SaCheckPermission("cai:consumeLog:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @@ -66,22 +50,8 @@ public class ConsumeLogController extends BaseController { return R.ok(res); } - /** - * 新增消费记录 - */ - @SaCheckPermission("cai:consumeLog:add") - @Log(title = "消费记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ConsumeLog bo) { - return toAjax(consumeLogService.save(bo)); - } - - /** - * 修改消费记录 - */ @SaCheckPermission("cai:consumeLog:edit") - @Log(title = "消费记录", businessType = BusinessType.UPDATE) + @Log(title = "计算分销", businessType = BusinessType.UPDATE) @RepeatSubmit() @GetMapping("/consumer") public R consumer(Long id) { @@ -89,16 +59,4 @@ public class ConsumeLogController extends BaseController { return R.ok(); } - /** - * 删除消费记录 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:consumeLog:remove") - @Log(title = "消费记录", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(consumeLogService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ForbidFilterController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ForbidFilterController.java index bff00728..8e54e2b6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ForbidFilterController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ForbidFilterController.java @@ -59,28 +59,6 @@ public class ForbidFilterController extends BaseController { return R.ok(forbidFilterService.getById(id)); } - /** - * 新增登陆拦截记录 - */ - @SaCheckPermission("cai:forbidFilter:add") - @Log(title = "登陆拦截记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ForbidFilter bo) { - return toAjax(forbidFilterService.save(bo)); - } - - /** - * 修改登陆拦截记录 - */ - @SaCheckPermission("cai:forbidFilter:edit") - @Log(title = "登陆拦截记录", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody ForbidFilter bo) { - return toAjax(forbidFilterService.updateById(bo)); - } - /** * 删除登陆拦截记录 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java index 08f0183a..0a9d5d5b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java @@ -4,28 +4,19 @@ 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.domain.RechargeOrder; -import com.ruoyi.cai.domain.User; -import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo; 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; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.BeanConvertUtil; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 守护赠送流水 @@ -71,38 +62,4 @@ public class GuardLogController extends BaseController { return R.ok(res); } - /** - * 新增守护赠送流水 - */ - @SaCheckPermission("cai:guardLog:add") - @Log(title = "守护赠送流水", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody GuardLog bo) { - return toAjax(guardLogService.save(bo)); - } - - /** - * 修改守护赠送流水 - */ - @SaCheckPermission("cai:guardLog:edit") - @Log(title = "守护赠送流水", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody GuardLog bo) { - return toAjax(guardLogService.updateById(bo)); - } - - /** - * 删除守护赠送流水 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:guardLog:remove") - @Log(title = "守护赠送流水", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(guardLogService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java index c9a3b273..ac95e013 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java @@ -5,22 +5,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.GuardTotal; import com.ruoyi.cai.service.GuardTotalService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 用户守护累计 @@ -58,39 +54,4 @@ public class GuardTotalController extends BaseController { @PathVariable Long id) { return R.ok(guardTotalService.getById(id)); } - - /** - * 新增用户守护累计 - */ - @SaCheckPermission("cai:guardTotal:add") - @Log(title = "用户守护累计", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody GuardTotal bo) { - return toAjax(guardTotalService.save(bo)); - } - - /** - * 修改用户守护累计 - */ - @SaCheckPermission("cai:guardTotal:edit") - @Log(title = "用户守护累计", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody GuardTotal bo) { - return toAjax(guardTotalService.updateById(bo)); - } - - /** - * 删除用户守护累计 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:guardTotal:remove") - @Log(title = "用户守护累计", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(guardTotalService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java index 16e109d3..a4fb2bfa 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java @@ -59,28 +59,6 @@ public class LowHeightRiskController extends BaseController { return R.ok(lowHeightRiskService.getById(id)); } - /** - * 新增高风险用户记录 - */ - @SaCheckPermission("cai:lowHeightRisk:add") - @Log(title = "高风险用户记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody LowHeightRisk bo) { - return toAjax(lowHeightRiskService.save(bo)); - } - - /** - * 修改高风险用户记录 - */ - @SaCheckPermission("cai:lowHeightRisk:edit") - @Log(title = "高风险用户记录", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody LowHeightRisk bo) { - return toAjax(lowHeightRiskService.updateById(bo)); - } - /** * 删除高风险用户记录 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java index bfef0cba..1f107001 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java @@ -8,24 +8,20 @@ import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo; import com.ruoyi.cai.service.RechargeOrderService; 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; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.BeanConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 充值订单 @@ -75,39 +71,4 @@ public class RechargeOrderController extends BaseController { BeanUtils.copyProperties(user,res); return R.ok(res); } - - /** - * 新增充值订单 - */ - @SaCheckPermission("cai:rechargeOrder:add") - @Log(title = "充值订单", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody RechargeOrder bo) { - return toAjax(rechargeOrderService.save(bo)); - } - - /** - * 修改充值订单 - */ - @SaCheckPermission("cai:rechargeOrder:edit") - @Log(title = "充值订单", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody RechargeOrder bo) { - return toAjax(rechargeOrderService.updateById(bo)); - } - - /** - * 删除充值订单 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:rechargeOrder:remove") - @Log(title = "充值订单", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(rechargeOrderService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java index 7f827647..68113138 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java @@ -59,17 +59,6 @@ public class ReportController extends BaseController { return R.ok(reportService.getById(id)); } - /** - * 新增举报 - */ - @SaCheckPermission("cai:report:add") - @Log(title = "举报", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody Report bo) { - return toAjax(reportService.save(bo)); - } - /** * 修改举报 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java index 0e47b7cc..fc4237f4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java @@ -58,28 +58,6 @@ public class SmsVerifyController extends BaseController { return R.ok(smsVerifyService.getById(id)); } - /** - * 新增短信验证码 - */ - @SaCheckPermission("cai:smsVerify:add") - @Log(title = "短信验证码", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SmsVerify bo) { - return toAjax(smsVerifyService.save(bo)); - } - - /** - * 修改短信验证码 - */ - @SaCheckPermission("cai:smsVerify:edit") - @Log(title = "短信验证码", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SmsVerify bo) { - return toAjax(smsVerifyService.updateById(bo)); - } - /** * 删除短信验证码 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java index f20b93cc..e9c5f0fc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java @@ -1,5 +1,6 @@ package com.ruoyi.cai.controller.admin; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.cai.dto.admin.SystemConfigResponse; import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.enums.SystemConfigGroupEnum; @@ -21,6 +22,7 @@ public class SystemConfigController { @Autowired private SystemConfigManager systemConfigManager; @GetMapping("/business/all") + @SaCheckPermission("cai:businessConfig:query") public R> businessAll(){ List responses = new ArrayList<>(); Map allSystemConfig = systemConfigManager.getAllSystemConfig(); @@ -38,6 +40,7 @@ public class SystemConfigController { } @GetMapping("/business/update") + @SaCheckPermission("cai:businessConfig:edit") public R businessUpdate(String key,String value){ SystemConfigEnum[] values = SystemConfigEnum.values(); for (SystemConfigEnum config : values) { @@ -53,6 +56,7 @@ public class SystemConfigController { } @GetMapping("/system/all") + @SaCheckPermission("cai:systemConfig:query") public R> systemAll(){ List responses = new ArrayList<>(); Map allSystemConfig = systemConfigManager.getAllSystemConfig(); @@ -70,6 +74,7 @@ public class SystemConfigController { } @GetMapping("/system/update") + @SaCheckPermission("cai:systemConfig:edit") public R systemUpdate(String key,String value){ systemConfigManager.set(key,value); return R.ok(true); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java index d36ad1f4..239bf685 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java @@ -19,16 +19,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; -/** - * 工会列表 - * - * @author 77 - * @date 2023-12-22 - */ @Validated @RequiredArgsConstructor @RestController @@ -37,9 +29,6 @@ public class UnionController extends BaseController { private final UnionService unionService; - /** - * 查询工会列表列表 - */ @SaCheckPermission("cai:userUnion:list") @GetMapping("/list") public TableDataInfo list(UnionAdminVo bo, PageQuery pageQuery) { @@ -48,11 +37,6 @@ public class UnionController extends BaseController { } - /** - * 获取工会列表详细信息 - * - * @param id 主键 - */ @SaCheckPermission("cai:userUnion:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @@ -60,9 +44,6 @@ public class UnionController extends BaseController { return R.ok(unionService.getById(id)); } - /** - * 新增工会列表 - */ @SaCheckPermission("cai:userUnion:add") @Log(title = "工会列表", businessType = BusinessType.INSERT) @RepeatSubmit() @@ -79,11 +60,8 @@ public class UnionController extends BaseController { return toAjax(unionService.updateById(bo)); } - /** - * 解散工会 - */ @SaCheckPermission("cai:userUnion:remove") - @Log(title = "工会列表", businessType = BusinessType.DELETE) + @Log(title = "解散工会", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") public R dissolve(@NotNull(message = "主键不能为空") @PathVariable Long id) { return toAjax(unionService.dissolve(id)); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java index 9958b7b7..8abcea61 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java @@ -11,16 +11,13 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 123 @@ -36,60 +33,24 @@ public class UnionUserController extends BaseController { private final UnionUserService unionUserService; - /** - * 查询123列表 - */ - @SaCheckPermission("cai:unionUser:list") @GetMapping("/list") public TableDataInfo list(UnionUserAdminVo bo, PageQuery pageQuery) { Page page = unionUserService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } - /** - * 获取123详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("cai:unionUser:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(unionUserService.getById(id)); } - /** - * 新增123 - */ - @SaCheckPermission("cai:unionUser:add") - @Log(title = "123", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UnionUser bo) { - return toAjax(unionUserService.save(bo)); - } - - /** - * 修改123 - */ @SaCheckPermission("cai:unionUser:edit") - @Log(title = "123", businessType = BusinessType.UPDATE) + @Log(title = "修改工会成员提成", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody UnionUser bo) { return toAjax(unionUserService.updateById(bo)); } - /** - * 删除123 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:unionUser:remove") - @Log(title = "123", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(unionUserService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java index 3c767cfb..912fd8ea 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java @@ -61,17 +61,6 @@ public class UserAlbumController extends BaseController { return R.ok(userAlbumService.getById(id)); } - /** - * 新增主播集锦 - */ - @SaCheckPermission("cai:userAlbum:add") - @Log(title = "主播集锦", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserAlbum bo) { - return toAjax(userAlbumService.save(bo)); - } - @SaCheckPermission("cai:userAlbum:edit") @Log(title = "主播集锦", businessType = BusinessType.UPDATE) @RepeatSubmit() diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java index d5c4f324..661357c0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java @@ -5,18 +5,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserCall; -import com.ruoyi.cai.domain.UserGift; import com.ruoyi.cai.dto.admin.vo.UserCallAdminVo; import com.ruoyi.cai.service.UserCallService; 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; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.BeanConvertUtil; import lombok.RequiredArgsConstructor; @@ -93,28 +89,6 @@ public class UserCallController extends BaseController { return R.ok(resp); } - /** - * 新增通话记录 - */ - @SaCheckPermission("cai:userCall:add") - @Log(title = "通话记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserCall bo) { - return toAjax(userCallService.save(bo)); - } - - /** - * 修改通话记录 - */ - @SaCheckPermission("cai:userCall:edit") - @Log(title = "通话记录", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserCall bo) { - return toAjax(userCallService.updateById(bo)); - } - /** * 删除通话记录 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java index d0cb389b..d5a1f119 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java @@ -61,17 +61,6 @@ public class UserCameraAuditController extends BaseController { return R.ok(userCameraAuditService.getById(id)); } - /** - * 新增自拍认证 - */ - @SaCheckPermission("cai:userCameraAudit:add") - @Log(title = "自拍认证", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserCameraAudit bo) { - return toAjax(userCameraAuditService.save(bo)); - } - /** * 修改自拍认证 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java index 01cdf8c7..f6c4b8a2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java @@ -58,28 +58,6 @@ public class UserChatRecordController extends BaseController { return R.ok(userChatRecordService.getById(id)); } - /** - * 新增聊天记录 - */ - @SaCheckPermission("cai:userChatRecord:add") - @Log(title = "聊天记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserChatRecord bo) { - return toAjax(userChatRecordService.save(bo)); - } - - /** - * 修改聊天记录 - */ - @SaCheckPermission("cai:userChatRecord:edit") - @Log(title = "聊天记录", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserChatRecord bo) { - return toAjax(userChatRecordService.updateById(bo)); - } - /** * 删除聊天记录 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java index 0db95240..305ba219 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java @@ -79,12 +79,14 @@ public class UserController extends BaseController { private UserForbidManager userForbidManager; @PostMapping("/resetAvatar") + @SaCheckPermission("cai:user:resetAvatar") public R resetAvatar(@RequestBody IdRes res){ userService.resetAvatar(res.getId()); return R.ok(); } @PostMapping("/userForbid") + @SaCheckPermission("cai:user:lock") public R userForbid(@RequestBody UserForbidReq userForbidReq){ userForbidManager.batchForbid(userForbidReq); return R.ok(); @@ -108,17 +110,6 @@ public class UserController extends BaseController { return R.ok(userAdminManager.getUser(id)); } - /** - * 新增用户 - */ - @SaCheckPermission("cai:user:add") - @Log(title = "用户", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody User bo) { - return toAjax(userService.save(bo)); - } - /** * 修改用户 */ @@ -130,7 +121,7 @@ public class UserController extends BaseController { return toAjax(userAdminManager.updateUser(bo)); } - @SaCheckPermission("cai:user:edit") + @SaCheckPermission("cai:user:updateMobile") @Log(title = "修改用户手机", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/updateMobile") @@ -139,6 +130,7 @@ public class UserController extends BaseController { } @PostMapping("/resetPwd") + @SaCheckPermission("cai:user:restPwd") public R resetPwd(@RequestBody ResetPasswordReq req) { User user = userService.getById(req.getUserId()); userService.resetPassword(req.getUserId(),user.getPassword()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java index 246c6c81..7db03208 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java @@ -11,16 +11,15 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 用户信息数量统计 @@ -47,6 +46,9 @@ public class UserCountController extends BaseController { } @GetMapping("/reset") + @SaCheckPermission("cai:userCount:edit") + @RepeatSubmit() + @Log(title = "用户信息数量统计", businessType = BusinessType.UPDATE) public R reset(Long userId) { userCountService.reset(userId); return R.ok(); @@ -65,38 +67,4 @@ public class UserCountController extends BaseController { return R.ok(userCountService.getById(userId)); } - /** - * 新增用户信息数量统计 - */ - @SaCheckPermission("cai:userCount:add") - @Log(title = "用户信息数量统计", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserCount bo) { - return toAjax(userCountService.save(bo)); - } - - /** - * 修改用户信息数量统计 - */ - @SaCheckPermission("cai:userCount:edit") - @Log(title = "用户信息数量统计", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserCount bo) { - return toAjax(userCountService.updateById(bo)); - } - - /** - * 删除用户信息数量统计 - * - * @param userIds 主键串 - */ - @SaCheckPermission("cai:userCount:remove") - @Log(title = "用户信息数量统计", businessType = BusinessType.DELETE) - @DeleteMapping("/{userIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Integer[] userIds) { - return toAjax(userCountService.removeBatchByIds(Arrays.asList(userIds))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java index e5b9f190..0fa27862 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java @@ -63,46 +63,12 @@ public class UserForbidController extends BaseController { return R.ok(userForbidService.getById(id)); } - /** - * 新增封号列表 - */ - @SaCheckPermission("cai:userForbid:add") - @Log(title = "封号列表", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserForbid bo) { - return toAjax(userForbidService.save(bo)); - } - @Log(title = "解封", businessType = BusinessType.UPDATE) @RepeatSubmit() + @SaCheckPermission("cai:userForbid:unForbid") @GetMapping("/un/forbid") public R unForbid(Long id) { userForbidManager.unForbidByForbidId(id); return R.ok(); } - - /** - * 修改封号列表 - */ - @SaCheckPermission("cai:userForbid:edit") - @Log(title = "封号列表", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserForbid bo) { - return toAjax(userForbidService.updateById(bo)); - } - - /** - * 删除封号列表 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:userForbid:remove") - @Log(title = "封号列表", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(userForbidService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java index 784ada7d..146bc18c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java @@ -59,28 +59,6 @@ public class UserForbidLogController extends BaseController { return R.ok(userForbidLogService.getById(id)); } - /** - * 新增封禁记录 - */ - @SaCheckPermission("cai:userForbidLog:add") - @Log(title = "封禁记录", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserForbidLog bo) { - return toAjax(userForbidLogService.save(bo)); - } - - /** - * 修改封禁记录 - */ - @SaCheckPermission("cai:userForbidLog:edit") - @Log(title = "封禁记录", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserForbidLog bo) { - return toAjax(userForbidLogService.updateById(bo)); - } - /** * 删除封禁记录 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java index 8dcd6a3f..99c99533 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java @@ -3,29 +3,20 @@ 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.RechargeOrder; -import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserGift; -import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo; import com.ruoyi.cai.service.UserGiftService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.BeanConvertUtil; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 礼物流水 @@ -70,38 +61,4 @@ public class UserGiftController extends BaseController { return R.ok(res); } - /** - * 新增礼物流水 - */ - @SaCheckPermission("cai:userGift:add") - @Log(title = "礼物流水", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserGift bo) { - return toAjax(userGiftService.save(bo)); - } - - /** - * 修改礼物流水 - */ - @SaCheckPermission("cai:userGift:edit") - @Log(title = "礼物流水", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserGift bo) { - return toAjax(userGiftService.updateById(bo)); - } - - /** - * 删除礼物流水 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:userGift:remove") - @Log(title = "礼物流水", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(userGiftService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java index cae49628..d8547b51 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java @@ -17,9 +17,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * 用户邀请 @@ -60,25 +58,12 @@ public class UserInviteController extends BaseController { /** * 新增用户邀请 */ - @SaCheckPermission("cai:userInvite:add") - @Log(title = "用户邀请", businessType = BusinessType.INSERT) + @SaCheckPermission("cai:userInvite:edit") + @Log(title = "用户邀请", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserInvite bo) { - return toAjax(userInviteService.save(bo)); + @PutMapping() + public R edit(@Validated(AddGroup.class) @RequestBody UserInvite bo) { + return toAjax(userInviteService.updateById(bo)); } - - /** - * 删除用户邀请 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:userInvite:remove") - @Log(title = "用户邀请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(userInviteService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java index b1f084e1..be8a003e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java @@ -78,9 +78,6 @@ public class UserMemberController extends BaseController { return toAjax(true); } - /** - * 删除会员管理 - */ @SaCheckPermission("cai:userMember:remove") @Log(title = "会员管理", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java index cd35f695..50194e5d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java @@ -7,24 +7,20 @@ import com.ruoyi.cai.domain.VipOrder; import com.ruoyi.cai.dto.admin.vo.VipOrderAdminVo; import com.ruoyi.cai.service.UserService; import com.ruoyi.cai.service.VipOrderService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.BeanConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; /** * VIP订单 @@ -69,38 +65,4 @@ public class VipOrderController extends BaseController { return R.ok(res); } - /** - * 新增VIP订单 - */ - @SaCheckPermission("cai:vipOrder:add") - @Log(title = "VIP订单", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody VipOrder bo) { - return toAjax(vipOrderService.save(bo)); - } - - /** - * 修改VIP订单 - */ - @SaCheckPermission("cai:vipOrder:edit") - @Log(title = "VIP订单", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody VipOrder bo) { - return toAjax(vipOrderService.updateById(bo)); - } - - /** - * 删除VIP订单 - * - * @param ids 主键串 - */ - @SaCheckPermission("cai:vipOrder:remove") - @Log(title = "VIP订单", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(vipOrderService.removeBatchByIds(Arrays.asList(ids))); - } }