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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 1bd2565..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
@@ -52,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));
}
@@ -89,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();
}
@@ -103,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));
}
@@ -151,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