From c3491a80818df29a03bd8f1b422b98a9c5e2238a Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期一, 20 五月 2024 10:42:12 +0800 Subject: [PATCH] 拍卖大屏展示 --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 18 +++++++----------- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/auctionBidRecordDTO.java | 7 +++++++ ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java | 4 ++-- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 8 +++----- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java | 4 ++-- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java | 4 ++-- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomGoodsVO.java | 4 +--- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java | 2 +- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/auctionBidRecordDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/auctionBidRecordDTO.java new file mode 100644 index 0000000..b0b8f2a --- /dev/null +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/auctionBidRecordDTO.java @@ -0,0 +1,7 @@ +package com.ruoyi.auction.controller.forepart.DTO; + +import lombok.Data; + +@Data +public class auctionBidRecordDTO { +} diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java similarity index 96% rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java index bd74acd..c48f9fb 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java @@ -30,8 +30,8 @@ * @since 2024-05-16 */ @RestController -@RequestMapping("/auction-bid-record") -public class AuctionBidRecordController { +@RequestMapping("/forepart/auction-bid-record") +public class ForepartAuctionBidRecordController { @Resource private IAuctionBidRecordService iAuctionBidRecordService; diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java similarity index 76% rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionGoodsController.java rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java index 118294c..b194185 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionGoodsController.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java @@ -14,7 +14,7 @@ * @since 2024-05-16 */ @RestController -@RequestMapping("/auction-goods") -public class AuctionGoodsController { +@RequestMapping("/forepart/auction-goods") +public class ForepartAuctionGoodsController { } diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java similarity index 86% rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java index 946f4dd..1e84c3b 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java @@ -3,8 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.auction.VO.AuctionSalesroomVO; -import com.ruoyi.auction.domain.pojo.AuctionBidRecord; +import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO; import com.ruoyi.auction.domain.pojo.AuctionSalesroom; import com.ruoyi.auction.domain.pojo.AuctionVideo; import com.ruoyi.auction.service.IAuctionSalesroomService; @@ -16,11 +15,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.baomidou.mybatisplus.core.conditions.*; + import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.sql.SQLException; -import java.sql.Wrapper; import java.util.List; /** @@ -32,8 +28,8 @@ * @since 2024-05-16 */ @RestController -@RequestMapping("/auction-salesroom") -public class AuctionSalesroomController { +@RequestMapping("/forepart/auction-salesroom") +public class ForepartAuctionSalesroomController { @Resource @@ -46,7 +42,7 @@ * 拍卖大屏获取拍卖信息 * */ - @RequestMapping("/getAuctionBidRecordList") + @RequestMapping("getAuctionBidRecordList") @ResponseBody @ApiOperation(value = "拍卖大屏获取拍卖信息") public R<List<AuctionSalesroom>> getAuctionBidRecordList(@PathVariable("salesroomName") String salesroomName) { @@ -87,9 +83,9 @@ @RequestMapping("/getAuctionBidRecordOne") @ResponseBody @ApiOperation(value = "扫码二维码获取拍卖场信息") - public R<AuctionSalesroom> getAuctionBidRecordOne(@PathVariable("salesroomName") String salesroomName) { + public R<AuctionSalesroom> getAuctionBidRecordOne(@PathVariable("auctionSalesroomQrcode") String auctionSalesroomQrcode) { LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery(); - wrapper.eq(AuctionSalesroom::getSalesroomName,salesroomName); + wrapper.eq(AuctionSalesroom::getAuctionSalesroomQrcode,auctionSalesroomQrcode); wrapper.eq(AuctionSalesroom::getDelFlag,0); AuctionSalesroom auctionBidRecord=iAuctionSalesroomService.getOne(wrapper); return R.ok(auctionBidRecord); diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java similarity index 95% rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java index 75b822c..6dbcef6 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.auction.VO.AuctionSalesroomGoodsVO; +import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomGoodsVO; import com.ruoyi.auction.domain.pojo.AuctionSalesroom; import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods; import com.ruoyi.auction.service.IAuctionSalesroomGoodsService; @@ -12,14 +12,12 @@ import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * <p> @@ -30,8 +28,8 @@ * @since 2024-05-16 */ @RestController -@RequestMapping("/auction-salesroom-goods") -public class AuctionSalesroomGoodsController { +@RequestMapping("/forepart/auction-salesroom-goods") +public class ForepartAuctionSalesroomGoodsController { diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionVideoController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java similarity index 77% rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionVideoController.java rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java index ab97cee..71c67e8 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionVideoController.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java @@ -14,7 +14,7 @@ * @since 2024-05-17 */ @RestController -@RequestMapping("/auction-video") -public class AuctionVideoController { +@RequestMapping("/forepart/auction-video") +public class ForepartAuctionVideoController { } diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomGoodsVO.java similarity index 90% rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomGoodsVO.java index 2d3280a..0a8664d 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomGoodsVO.java @@ -1,7 +1,5 @@ -package com.ruoyi.auction.VO; +package com.ruoyi.auction.controller.forepart.VO; -import com.ruoyi.common.core.enums.AuctionStartStatusEnum; -import com.ruoyi.common.core.enums.AuctionTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java similarity index 86% rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomVO.java rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java index 32e8297..f32155d 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomVO.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.auction.VO; +package com.ruoyi.auction.controller.forepart.VO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -- Gitblit v1.7.1