diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountCashController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountCashController.java index c8980185..b813b8f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountCashController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountCashController.java @@ -4,6 +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.AccountCash; +import com.ruoyi.cai.dto.admin.common.IdsReq; import com.ruoyi.cai.dto.admin.vo.AccountCashAdminVo; import com.ruoyi.cai.dto.admin.vo.account.ExportBatchAuditVo; import com.ruoyi.cai.enums.AccountCashStatusEnum; @@ -27,7 +28,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -128,10 +128,9 @@ public class AccountCashController extends BaseController { @SaCheckPermission("cai:accountCash:edit") @Log(title = "用户提现批量通过", businessType = BusinessType.UPDATE) @RepeatSubmit() - @GetMapping("/batchSuccess") - public R batchSuccess(String ids) { - List idList = Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList()); - ExportBatchAuditVo audit = accountCashService.batchAudit(idList); + @PostMapping("/batchSuccess") + public R batchSuccess(@RequestBody IdsReq ids) { + ExportBatchAuditVo audit = accountCashService.batchAudit(ids.getIds()); return R.ok(audit); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorApplyController.java index eb5adc6a..b79bc974 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorApplyController.java @@ -4,16 +4,13 @@ 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.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; 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; 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; @@ -62,7 +59,7 @@ public class AnchorApplyController extends BaseController { @SaCheckPermission("cai:anchorApply:edit") @Log(title = "主播申请-同意", businessType = BusinessType.UPDATE) @PostMapping("/auditAnchorSuccess") - public R auditAnchorSuccess(@RequestBody IdRes id) { + public R auditAnchorSuccess(@RequestBody IdReq id) { anchorApplyService.auditAnchorSuccess(id.getId()); return R.ok(); } @@ -70,7 +67,7 @@ public class AnchorApplyController extends BaseController { @SaCheckPermission("cai:anchorApply:edit") @Log(title = "主播申请-不同意", businessType = BusinessType.UPDATE) @PostMapping("/auditAnchorFail") - public R auditAnchorFail(@RequestBody IdRes id) { + public R auditAnchorFail(@RequestBody IdReq id) { anchorApplyService.auditAnchorFail(id.getId()); return R.ok(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java index dabf9ea9..20bb30a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.Dynamic; import com.ruoyi.cai.dto.admin.query.BatchAuditReq; import com.ruoyi.cai.dto.admin.vo.DynamicAdminVo; -import com.ruoyi.cai.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.enums.AuditStatusEnum; import com.ruoyi.cai.service.DynamicService; import com.ruoyi.common.annotation.Log; @@ -16,7 +16,6 @@ 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; @@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -80,7 +78,7 @@ public class DynamicController extends BaseController { @Log(title = "主播动态修改成功", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/audit/success") - public R auditSuccess(@RequestBody IdRes bo) { + public R auditSuccess(@RequestBody IdReq bo) { boolean success = dynamicService.auditSuccess(Collections.singletonList(bo.getId())); return R.ok(); } @@ -90,7 +88,7 @@ public class DynamicController extends BaseController { @Log(title = "主播动态修改失败", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/audit/fail") - public R auditFail(@RequestBody IdRes bo) { + public R auditFail(@RequestBody IdReq bo) { dynamicService.auditFail(bo.getId()); return R.ok(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ReportController.java index d6492f31..ffef04de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ReportController.java @@ -5,7 +5,7 @@ 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.dto.admin.vo.ReportAdminVo; -import com.ruoyi.cai.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.notice.YunxinHttpService; import com.ruoyi.cai.service.ReportService; import com.ruoyi.common.annotation.Log; @@ -14,8 +14,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 lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -68,7 +66,7 @@ public class ReportController extends BaseController { @Log(title = "举报处理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/audit/success") - public R edit(@RequestBody IdRes id) { + public R edit(@RequestBody IdReq id) { boolean update = reportService.update(Wrappers.lambdaUpdate(Report.class) .eq(Report::getId, id.getId()) .eq(Report::getStatus, 0) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushController.java index e971100d..f05cccdd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.SysPush; import com.ruoyi.cai.dto.admin.query.syspush.SysPushParams; -import com.ruoyi.cai.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.service.SysPushService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -63,8 +63,8 @@ public class SysPushController extends BaseController { @Log(title = "推送系统消息执行", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/run") - public R run(@RequestBody IdRes idRes) { - sysPushService.handStart(idRes.getId()); + public R run(@RequestBody IdReq idReq) { + sysPushService.handStart(idReq.getId()); return R.ok(); } @@ -72,8 +72,8 @@ public class SysPushController extends BaseController { @Log(title = "取消定时系统消息执行", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/close") - public R close(@RequestBody IdRes idRes) { - sysPushService.closeSysPush(idRes.getId()); + public R close(@RequestBody IdReq idReq) { + sysPushService.closeSysPush(idReq.getId()); return R.ok(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java index c21c6d42..20d9703f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java @@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.admin.query.UserForbidReq; 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.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.manager.UserAdminManager; import com.ruoyi.cai.manager.UserForbidManager; import com.ruoyi.cai.service.UserService; @@ -20,7 +20,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 lombok.RequiredArgsConstructor; @@ -81,7 +80,7 @@ public class UserController extends BaseController { @PostMapping("/resetAvatar") @SaCheckPermission("cai:user:resetAvatar") @Log(title = "重置用户头像", businessType = BusinessType.UPDATE) - public R resetAvatar(@RequestBody IdRes res){ + public R resetAvatar(@RequestBody IdReq res){ userService.resetAvatar(res.getId()); return R.ok(); } @@ -89,7 +88,7 @@ public class UserController extends BaseController { @PostMapping("/resetNickname") @SaCheckPermission("cai:user:resetNickname") @Log(title = "重置用户昵称", businessType = BusinessType.UPDATE) - public R resetNickname(@RequestBody IdRes res){ + public R resetNickname(@RequestBody IdReq res){ userService.resetNickname(res.getId()); return R.ok(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java index 36220e92..c7292022 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java @@ -3,7 +3,7 @@ package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.cai.domain.UserAlbum; import com.ruoyi.cai.dto.app.query.album.AlbumAddReq; -import com.ruoyi.cai.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.dto.app.query.user.UserUpdateAvatarReq; import com.ruoyi.cai.dto.app.query.user.UserUpdateReq; import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet; @@ -132,7 +132,7 @@ public class UserAppController { @PostMapping("/album/del") @Operation(summary = "删除相册") @Log(title = "删除相册", businessType = BusinessType.OTHER, isSaveDb = true) - public R userAlbumDel(@RequestBody IdRes res){ + public R userAlbumDel(@RequestBody IdReq res){ return R.ok(userAlbumService.removeAlbum(res.getId())); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java index 97ca0b95..f6ec43ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java @@ -3,7 +3,7 @@ package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.DynamicAddReq; import com.ruoyi.cai.dto.app.query.DynamicQuery; -import com.ruoyi.cai.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.dto.app.vo.DynamicListVo; import com.ruoyi.cai.service.DynamicService; import com.ruoyi.common.annotation.Log; @@ -73,7 +73,7 @@ public class UserDynamicAppController { @PostMapping("/delete") @Operation(summary = "删除动态") @Log(title = "删除动态", businessType = BusinessType.OTHER, isSaveDb = true) - public R delete(@RequestBody IdRes res){ + public R delete(@RequestBody IdReq res){ dynamicService.deleteDynamic(res.getId()); return R.ok(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java index 584ec211..1b17128f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java @@ -2,7 +2,7 @@ package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserGreet; -import com.ruoyi.cai.dto.app.query.IdRes; +import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.dto.app.query.user.UserGreetAddReq; import com.ruoyi.cai.dto.app.vo.user.UserGreetListVo; import com.ruoyi.cai.dto.app.vo.user.UserGreetVo; @@ -62,7 +62,7 @@ public class UserGreetAppController { @PostMapping("/delete") @Operation(summary = "删除群打招呼") @Log(title = "删除群打招呼", businessType = BusinessType.OTHER, isSaveDb = true) - public R add(@RequestBody IdRes req){ + public R add(@RequestBody IdReq req){ userGreetService.removeById(req.getId()); return R.ok(); } @@ -70,7 +70,7 @@ public class UserGreetAppController { @PostMapping("/send") @Operation(summary = "群打招呼") @Log(title = "群打招呼", businessType = BusinessType.OTHER, isSaveDb = true) - public R send(@RequestBody IdRes req){ + public R send(@RequestBody IdReq req){ userGreetService.batchSend(req.getId(),LoginHelper.getUserId()); return R.ok(); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/common/IdsReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/common/IdsReq.java new file mode 100644 index 00000000..95d3b3a6 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/common/IdsReq.java @@ -0,0 +1,10 @@ +package com.ruoyi.cai.dto.admin.common; + +import lombok.Data; + +import java.util.List; + +@Data +public class IdsReq { + private List ids; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdReq.java similarity index 92% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdReq.java index c300f8c0..2f2e3205 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdReq.java @@ -6,7 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; @Data -public class IdRes { +public class IdReq { @Schema(description = "id") @NotNull(message = "参数异常") private Long id; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java index 94e8674a..c37de184 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java @@ -6,7 +6,6 @@ import com.ruoyi.cai.domain.Dynamic; import com.ruoyi.cai.dto.admin.vo.DynamicAdminVo; import com.ruoyi.cai.dto.app.query.DynamicAddReq; import com.ruoyi.cai.dto.app.query.DynamicQuery; -import com.ruoyi.cai.dto.app.query.IdRes; import com.ruoyi.cai.dto.app.vo.DynamicListVo; import com.ruoyi.common.core.domain.PageQuery; import org.springframework.transaction.annotation.Transactional;