From a6508a543e3727eb527db5feec9ac7155e88f599 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 03 六月 2024 21:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java | 122 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 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 5b8ff62..14a05bb 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,18 +1,31 @@
package com.ruoyi.auction.controller.management;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomGoodsQuery;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
+import com.ruoyi.auction.controller.management.dto.MgtScreenBidPage;
+import com.ruoyi.auction.controller.management.dto.MgtScreenSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.management.dto.MgtScreenVideoDTO;
+import com.ruoyi.auction.controller.management.vo.MgtAuctionBidRecordVO;
+import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomScreenVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.common.core.web.page.BasePage;
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;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+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,10 +65,109 @@
* @param id 拍卖会id
* @return 大屏操作台拍卖场视图对象
*/
- @PostMapping("/detail/{id}")
+ @GetMapping("/detail/{id}")
@ApiOperation(value = "进入详情", notes = "进入详情")
- public R<MgtAuctionSalesroomScreenVO> getAuctionSalesroomDetail(@PathVariable("id") Long id,
- @RequestParam("basePage") BasePage basePage) {
- return R.ok(auctionSalesroomService.getAuctionSalesroomDetail(id, basePage));
+ public R<MgtAuctionSalesroomScreenVO> getAuctionSalesroomDetail(
+ @ApiParam(name = "id", value = "拍卖会id", required = true) @PathVariable("id") Long id) {
+ return R.ok(auctionSalesroomService.getAuctionSalesroomDetail(id));
+ }
+
+ /**
+ * 进入详情-出价会员列表
+ *
+ * @param mgtScreenBidPage 分页参数对象
+ * @return PageDTO<MgtAuctionBidRecordVO>
+ */
+ @PostMapping("/bid-list")
+ @ApiOperation(value = "进入详情-出价会员列表", notes = "进入详情-出价会员列表")
+ public R<PageDTO<MgtAuctionBidRecordVO>> getAuctionSalesroomDetail(
+ @Validated @RequestBody MgtScreenBidPage mgtScreenBidPage) {
+ return R.ok(auctionSalesroomService.getScreenBidRecordList(mgtScreenBidPage));
+ }
+
+ /**
+ * 添加商品
+ *
+ * @param dto 大屏操作台添加商品数据传输对象
+ */
+ @PostMapping("/add-goods")
+ @ApiOperation(value = "添加商品", notes = "添加商品")
+ public R<?> addGoods(@RequestBody MgtScreenSalesroomGoodsDTO dto) {
+ auctionSalesroomService.addGoods(dto);
+ return R.ok();
+ }
+
+ /**
+ * 获取备选拍品列表的分页数据
+ *
+ * @param query 拍卖场商品关系查询对象
+ * @return PageDTO<MgtAuctionSalesroomGoodsVO>
+ */
+ @PostMapping("/backup-goods")
+ @ApiOperation(value = "获取备选拍品列表的分页数据", notes = "获取备选拍品列表的分页数据")
+ public R<PageDTO<MgtAuctionSalesroomGoodsVO>> backupGoods(
+ @RequestBody MgtAuctionSalesroomGoodsQuery query) {
+ return R.ok(auctionSalesroomService.backupGoods(query));
+ }
+
+ /**
+ * 添加备选商品
+ *
+ * @param idList 备选商品id集合
+ */
+ @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) {
+ auctionSalesroomService.addBackupGoods(idList);
+ return R.ok();
+ }
+
+ /**
+ * 结束当前拍卖商品
+ *
+ * @param id 拍卖场商品id
+ */
+ @PutMapping("/stop-current/{id}")
+ @ApiOperation("停止当前拍品")
+ public R<?> stopCurrentGoods(
+ @ApiParam(name = "id", value = "拍卖场商品id", required = true) @PathVariable("id") Long id) {
+ auctionSalesroomService.stopCurrentGoods(id);
+ return R.ok();
+ }
+
+ /**
+ * 开始下一拍卖商品
+ *
+ * @param id 拍卖场商品id
+ */
+ @PutMapping("/start-next/{id}")
+ @ApiOperation("开始下一拍卖商品")
+ public R<?> startNextGoods(
+ @ApiParam(name = "id", value = "拍卖场商品id", required = true) @PathVariable("id") Long id) {
+ auctionSalesroomService.startNextGoods(id);
+ return R.ok();
+ }
+
+ /**
+ * 播放视频
+ *
+ * @param dto 大屏播放视频对象
+ */
+ @PostMapping("/play")
+ @ApiOperation("播放视频")
+ public R<?> play(@RequestBody MgtScreenVideoDTO dto) {
+ auctionSalesroomService.play(dto);
+ return R.ok();
+ }
+
+ @PostMapping("/stop-play/{auctionSalesroomId}")
+ @ApiOperation("播放视频")
+ public R<?> stopPlay(
+ @ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
+ @PathVariable("auctionSalesroomId") Long auctionSalesroomId) {
+ auctionSalesroomService.stopPlay(auctionSalesroomId);
+ return R.ok();
}
}
--
Gitblit v1.7.1