From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 14 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..6566490 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
@@ -1,6 +1,7 @@
package com.ruoyi.auction.controller.management;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomGoodsQuery;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
import com.ruoyi.auction.controller.management.dto.MgtScreenBidPage;
@@ -14,9 +15,10 @@
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;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +27,7 @@
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;
/**
@@ -52,7 +55,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 +92,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,19 +106,22 @@
@PostMapping("/backup-goods")
@ApiOperation(value = "获取备选拍品列表的分页数据", notes = "获取备选拍品列表的分页数据")
public R<PageDTO<MgtAuctionSalesroomGoodsVO>> backupGoods(
- @RequestBody MgtAuctionSalesroomGoodsQuery query) {
+ @Validated @RequestBody MgtAuctionSalesroomGoodsQuery query) {
return R.ok(auctionSalesroomService.backupGoods(query));
}
/**
* 添加备选商品
*
- * @param idList 备选商品id集合
+ * @param idStr 备选商品id集合
*/
@PutMapping("/add-backup-goods")
@ApiOperation(value = "选择备选商品", notes = "选择备选商品")
- public R<?> addBackupGoods(@RequestBody List<Long> idList) {
- auctionSalesroomService.addBackupGoods(idList);
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "idStr", value = "商品id集合", required = true)
+ })
+ public R<?> addBackupGoods(@RequestParam("idStr") String idStr) {
+ auctionSalesroomService.addBackupGoods(idStr);
return R.ok();
}
@@ -125,10 +131,14 @@
* @param id 拍卖场商品id
*/
@PutMapping("/stop-current/{id}")
- @ApiOperation("停止当前拍品")
+ @ApiOperation("结束当前拍卖商品")
public R<?> stopCurrentGoods(
@ApiParam(name = "id", value = "拍卖场商品id", required = true) @PathVariable("id") Long id) {
- auctionSalesroomService.stopCurrentGoods(id);
+ try {
+ auctionSalesroomService.stopCurrentGoods(id);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
return R.ok();
}
@@ -141,7 +151,11 @@
@ApiOperation("开始下一拍卖商品")
public R<?> startNextGoods(
@ApiParam(name = "id", value = "拍卖场商品id", required = true) @PathVariable("id") Long id) {
- auctionSalesroomService.startNextGoods(id);
+ try {
+ auctionSalesroomService.startNextGoods(id);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
return R.ok();
}
@@ -151,18 +165,59 @@
* @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("播放视频")
+ /**
+ * 结束播放
+ *
+ * @param auctionSalesroomId 拍卖场id
+ */
+ @PutMapping("/stop-play/{auctionSalesroomId}")
+ @ApiOperation("结束播放")
public R<?> stopPlay(
@ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
@PathVariable("auctionSalesroomId") Long auctionSalesroomId) {
auctionSalesroomService.stopPlay(auctionSalesroomId);
return R.ok();
}
+
+ /**
+ * 开始当前拍卖场
+ *
+ * @param auctionSalesroomId 拍卖场id
+ */
+ @PutMapping("/start-auction/{auctionSalesroomId}")
+ @ApiOperation("开始当前拍卖场")
+ public R<?> startCurrentAuctionSalesroom(
+ @ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
+ @PathVariable("auctionSalesroomId") Long auctionSalesroomId) {
+ try {
+ auctionSalesroomService.startCurrentAuctionSalesroom(auctionSalesroomId);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 结束当前拍卖场
+ *
+ * @param auctionSalesroomId 拍卖场id
+ */
+ @PutMapping("/stop-auction/{auctionSalesroomId}")
+ @ApiOperation("结束当前拍卖场")
+ public R<?> stopCurrentAuctionSalesroom(
+ @ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
+ @PathVariable("auctionSalesroomId") Long auctionSalesroomId) {
+ try {
+ auctionSalesroomService.stopCurrentAuctionSalesroom(auctionSalesroomId);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1