shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1231123

Browse Source
This commit is contained in:
77
2024-06-02 01:34:01 +08:00
parent 3684cb3649
commit 8644ebb7d6
8 changed files with 80 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java
View File

@@ -1,8 +1,6 @@
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.dto.admin.query.BatchAuditReq;
@@ -14,8 +12,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.validation.annotation.Validated;
@@ -23,8 +19,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Collections;
/**
* 主播集锦
@@ -77,7 +73,7 @@ public class UserAlbumController extends BaseController {
@PutMapping("/audit/fail")
public R<Void> auditFail(@RequestBody UserAlbum bo) {
// userAlbumService.auditFail(bo.getId());
userAlbumService.removeAlbum(bo.getId());
userAlbumService.removeAlbum(Collections.singletonList(bo.getId()));
return R.ok();
}
@@ -101,6 +97,7 @@ public class UserAlbumController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(userAlbumService.removeBatchByIds(Arrays.asList(ids)));
userAlbumService.removeAlbum(Arrays.asList(ids));
return R.ok();
}
}

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java
View File

@@ -32,6 +32,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@RestController
@@ -133,7 +135,8 @@ public class UserAppController {
@Operation(summary = "删除相册")
@Log(title = "删除相册", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Boolean> userAlbumDel(@RequestBody IdReq res){
return R.ok(userAlbumService.removeAlbum(res.getId()));
userAlbumService.removeAlbum(Collections.singletonList(res.getId()));
return R.ok(true);
}
@PostMapping("/album/add")