From 2a97ecf8833f24dfbd5bf251e1fc1bdb632bbefb Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 29 七月 2024 18:51:22 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java | 8 ++++++-- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/WebSocketController.java | 28 ++++++++++++++++++++++++++++ ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java | 3 +++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/WebSocketController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/WebSocketController.java new file mode 100644 index 0000000..ce03a83 --- /dev/null +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/WebSocketController.java @@ -0,0 +1,28 @@ +package com.ruoyi.auction.controller; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.enums.ClientTypeEnum; +import com.ruoyi.system.api.domain.WebsocketMessageDTO; +import com.ruoyi.system.api.feignClient.SysUserClient; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/websocket") +public class WebSocketController { + + @Resource + private SysUserClient sysUserClient; + + @GetMapping("/push/{type}/{msg}") + public R<?> push(@PathVariable("type") Integer type, @PathVariable("msg") String msg) { + sysUserClient.pushByClientType(WebsocketMessageDTO.builder().clientType(ClientTypeEnum.getEnumByCode(type)).message(msg).build(), SecurityConstants.INNER); + return R.ok(); + } + + +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java index 793b2b0..b748a45 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java @@ -49,10 +49,14 @@ @ApiModelProperty(value = "拍卖场说明") private String description; - @ApiModelProperty(value = "拍卖场封面图") - @NotBlank(message = "拍卖场封面图不能为空") + @ApiModelProperty(value = "大屏拍卖场封面图") + @NotBlank(message = "大屏拍卖场封面图不能为空") private String coverPic; + @ApiModelProperty(value = "用户端拍卖场封面图") + // @NotBlank(message = "用户端拍卖场封面图不能为空") + private String clientCoverPic; + @ApiModelProperty(value = "分享标题") @NotBlank(message = "分享标题不能为空") private String shareTitle; diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java index 607f0c5..96820e2 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java @@ -57,6 +57,9 @@ @ApiModelProperty(value = "拍卖场封面图") private String coverPic; + @ApiModelProperty(value = "用户端拍卖场封面图") + private String clientCoverPic; + @ApiModelProperty(value = "分享标题") private String shareTitle; -- Gitblit v1.7.1