From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
index f80f3db..80f5cd5 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
@@ -1,6 +1,7 @@
package com.ruoyi.auction.controller.management;
+import com.google.zxing.WriterException;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSaleroomBidRecordQuery;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
@@ -11,6 +12,8 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import java.io.IOException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -47,7 +50,7 @@
@PostMapping("/page")
@ApiOperation(value = "获取拍卖场列表的分页数据", notes = "获取拍卖场列表的分页数据")
public R<PageDTO<MgtAuctionSalesroomVO>> getAuctionSalesroomPage(
- MgtAuctionSalesroomQuery query) {
+ @Validated @RequestBody MgtAuctionSalesroomQuery query) {
return R.ok(auctionSalesroomService.getAuctionSalesroomPage(query));
}
@@ -59,7 +62,8 @@
*/
@GetMapping("/qr-code/{id}")
@ApiOperation(value = "查看二维码", notes = "查看二维码")
- public R<String> getQrCode(@PathVariable("id") Long id) {
+ public R<String> getQrCode(
+ @ApiParam(name = "id", value = "拍卖场id", required = true) @PathVariable("id") Long id) {
try {
return R.ok(auctionSalesroomService.getQrCode(id));
} catch (Exception e) {
@@ -77,7 +81,11 @@
@ApiOperation(value = "添加/编辑 拍卖场", notes = "添加/编辑 拍卖场")
public R<?> saveAuctionSalesroom(
@Validated @RequestBody MgtAuctionSalesroomDTO dto) {
- auctionSalesroomService.saveAuctionSalesroom(dto);
+ try {
+ auctionSalesroomService.saveAuctionSalesroom(dto);
+ } catch (IOException | WriterException e) {
+ throw new RuntimeException(e);
+ }
return R.ok();
}
@@ -89,8 +97,9 @@
*/
@GetMapping("/{id}")
@ApiOperation(value = "查看详情", notes = "查看详情")
- public R<MgtAuctionSalesroomVO> getAuctionSalesroom(@PathVariable("id") Long id) {
- return R.ok(auctionSalesroomService.getAuctionSalesroom(id));
+ public R<MgtAuctionSalesroomVO> getAuctionSalesroom(
+ @ApiParam(name = "id", value = "拍卖会id", required = true) @PathVariable("id") Long id) {
+ return R.ok(auctionSalesroomService.getAuctionSalesroom(id, Boolean.FALSE));
}
/**
@@ -102,7 +111,7 @@
@PostMapping("/bid-record")
@ApiOperation(value = "查看详情-出价记录", notes = "查看详情-出价记录")
public R<PageDTO<MgtAuctionBidRecordVO>> getAuctionSalesroomBidRecordList(
- @RequestBody MgtAuctionSaleroomBidRecordQuery query) {
+ @Validated @RequestBody MgtAuctionSaleroomBidRecordQuery query) {
return R.ok(auctionSalesroomService.getAuctionSalesroomBidRecordList(query));
}
}
--
Gitblit v1.7.1