From 2f1988b9b3047e64d1a7b85fbaf8518d16eb88ec Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 11:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java
index 14a05bb..0369a2e 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java
@@ -14,8 +14,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import java.util.List;
@@ -27,7 +25,6 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -55,7 +52,7 @@
@PostMapping("/page")
@ApiOperation(value = "获取拍卖场列表的分页数据", notes = "获取拍卖场列表的分页数据")
public R<PageDTO<MgtAuctionSalesroomVO>> getAuctionSalesroom4ScreenPage(
- MgtAuctionSalesroomQuery query) {
+ @Validated @RequestBody MgtAuctionSalesroomQuery query) {
return R.ok(auctionSalesroomService.getAuctionSalesroom4ScreenPage(query));
}
@@ -92,7 +89,7 @@
*/
@PostMapping("/add-goods")
@ApiOperation(value = "添加商品", notes = "添加商品")
- public R<?> addGoods(@RequestBody MgtScreenSalesroomGoodsDTO dto) {
+ public R<?> addGoods(@Validated @RequestBody MgtScreenSalesroomGoodsDTO dto) {
auctionSalesroomService.addGoods(dto);
return R.ok();
}
@@ -106,7 +103,7 @@
@PostMapping("/backup-goods")
@ApiOperation(value = "获取备选拍品列表的分页数据", notes = "获取备选拍品列表的分页数据")
public R<PageDTO<MgtAuctionSalesroomGoodsVO>> backupGoods(
- @RequestBody MgtAuctionSalesroomGoodsQuery query) {
+ @Validated @RequestBody MgtAuctionSalesroomGoodsQuery query) {
return R.ok(auctionSalesroomService.backupGoods(query));
}
@@ -117,9 +114,7 @@
*/
@PutMapping("/add-backup-goods")
@ApiOperation(value = "选择备选商品", notes = "选择备选商品")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "idList", value = "备选商品id集合", required = true, dataType = "List")})
- public R<?> addBackupGoods(@RequestParam("idList") List<Long> idList) {
+ public R<?> addBackupGoods(@RequestBody List<Long> idList) {
auctionSalesroomService.addBackupGoods(idList);
return R.ok();
}
@@ -156,14 +151,14 @@
* @param dto 大屏播放视频对象
*/
@PostMapping("/play")
- @ApiOperation("播放视频")
- public R<?> play(@RequestBody MgtScreenVideoDTO dto) {
+ @ApiOperation("播放视频-确认")
+ public R<?> play(@Validated @RequestBody MgtScreenVideoDTO dto) {
auctionSalesroomService.play(dto);
return R.ok();
}
@PostMapping("/stop-play/{auctionSalesroomId}")
- @ApiOperation("播放视频")
+ @ApiOperation("结束播放")
public R<?> stopPlay(
@ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
@PathVariable("auctionSalesroomId") Long auctionSalesroomId) {
--
Gitblit v1.7.1