修改bug

mitao

2024-07-29 b919f4d1a998b670dac6ea61edb7aa52fc0068a0

 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;
@@ -18,7 +19,6 @@
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;
@@ -55,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));
    }

@@ -92,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();
    }
@@ -106,21 +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 = "选择备选商品")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "idList", value = "备选商品id集合", required = true, dataType = "List")})
    public R<?> addBackupGoods(@RequestParam("idList") List<Long> idList) {
        auctionSalesroomService.addBackupGoods(idList);
            @ApiImplicitParam(name = "idStr", value = "商品id集合", required = true)
    })
    public R<?> addBackupGoods(@RequestParam("idStr") String idStr) {
        auctionSalesroomService.addBackupGoods(idStr);
        return R.ok();
    }

@@ -130,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();
    }

@@ -146,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();
    }

@@ -156,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();
    }
}