This commit is contained in:
77
2024-04-12 00:52:22 +08:00
parent 821e37c374
commit 0aa9ab2165
12 changed files with 38 additions and 38 deletions

View File

@@ -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<ExportBatchAuditVo> batchSuccess(String ids) {
List<Long> idList = Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList());
ExportBatchAuditVo audit = accountCashService.batchAudit(idList);
@PostMapping("/batchSuccess")
public R<ExportBatchAuditVo> batchSuccess(@RequestBody IdsReq ids) {
ExportBatchAuditVo audit = accountCashService.batchAudit(ids.getIds());
return R.ok(audit);
}

View File

@@ -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<Void> auditAnchorSuccess(@RequestBody IdRes id) {
public R<Void> 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<Void> auditAnchorFail(@RequestBody IdRes id) {
public R<Void> auditAnchorFail(@RequestBody IdReq id) {
anchorApplyService.auditAnchorFail(id.getId());
return R.ok();
}

View File

@@ -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<Void> auditSuccess(@RequestBody IdRes bo) {
public R<Void> 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<Void> auditFail(@RequestBody IdRes bo) {
public R<Void> auditFail(@RequestBody IdReq bo) {
dynamicService.auditFail(bo.getId());
return R.ok();
}

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.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<Void> edit(@RequestBody IdRes id) {
public R<Void> edit(@RequestBody IdReq id) {
boolean update = reportService.update(Wrappers.lambdaUpdate(Report.class)
.eq(Report::getId, id.getId())
.eq(Report::getStatus, 0)

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.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<Void> run(@RequestBody IdRes idRes) {
sysPushService.handStart(idRes.getId());
public R<Void> 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<Void> close(@RequestBody IdRes idRes) {
sysPushService.closeSysPush(idRes.getId());
public R<Void> close(@RequestBody IdReq idReq) {
sysPushService.closeSysPush(idReq.getId());
return R.ok();
}

View File

@@ -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<Void> resetAvatar(@RequestBody IdRes res){
public R<Void> 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<Void> resetNickname(@RequestBody IdRes res){
public R<Void> resetNickname(@RequestBody IdReq res){
userService.resetNickname(res.getId());
return R.ok();
}

View File

@@ -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<Boolean> userAlbumDel(@RequestBody IdRes res){
public R<Boolean> userAlbumDel(@RequestBody IdReq res){
return R.ok(userAlbumService.removeAlbum(res.getId()));
}

View File

@@ -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<Void> delete(@RequestBody IdRes res){
public R<Void> delete(@RequestBody IdReq res){
dynamicService.deleteDynamic(res.getId());
return R.ok();
}

View File

@@ -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<Void> add(@RequestBody IdRes req){
public R<Void> 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<Void> send(@RequestBody IdRes req){
public R<Void> send(@RequestBody IdReq req){
userGreetService.batchSend(req.getId(),LoginHelper.getUserId());
return R.ok();
}