From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 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 0369a2e..299ef25 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;
/**
@@ -114,8 +117,11 @@
*/
@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,7 +131,7 @@
* @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);
@@ -157,7 +163,12 @@
return R.ok();
}
- @PostMapping("/stop-play/{auctionSalesroomId}")
+ /**
+ * 结束播放
+ *
+ * @param auctionSalesroomId 拍卖场id
+ */
+ @PutMapping("/stop-play/{auctionSalesroomId}")
@ApiOperation("结束播放")
public R<?> stopPlay(
@ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
@@ -165,4 +176,40 @@
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