From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLiveController.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLiveController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLiveController.java
index 2efc448..817a13f 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLiveController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLiveController.java
@@ -4,20 +4,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.goods.domain.dto.XiaoeLiveDto;
import com.ruoyi.goods.domain.dto.XiaoeLiveQueryDto;
-import com.ruoyi.goods.domain.vo.XiaoeLiveVo;
+import com.ruoyi.goods.domain.vo.XiaoeLiveDetailVOV2;
+import com.ruoyi.goods.domain.vo.XiaoeLiveVoV2;
import com.ruoyi.goods.service.biz.XiaoeLiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@@ -33,16 +28,28 @@
@RequestMapping("/mer/live")
public class MerLiveController {
private final XiaoeLiveService xiaoeLiveService;
-
+
/**
* 直播首页分页列表
+ *
* @param dto
* @return
*/
@ApiOperation("直播首页分页列表")
@PostMapping("/page")
- public R<Page<XiaoeLiveVo>> page(@Valid @RequestBody XiaoeLiveQueryDto dto) {
+ public R<Page<XiaoeLiveVoV2>> page(@Valid @RequestBody XiaoeLiveQueryDto dto) {
return R.ok(xiaoeLiveService.getLivePage(dto));
+ }
+
+ /**
+ * 直播详情
+ * @param id
+ * @return
+ */
+ @ApiOperation("直播详情")
+ @GetMapping("/detail/{id}")
+ public R<XiaoeLiveDetailVOV2> detail(@ApiParam(name = "id",value = "直播id", required = true) @PathVariable("id") String id) {
+ return R.ok(xiaoeLiveService.getLiveDetail(id));
}
/**
@@ -55,15 +62,16 @@
public R<Boolean> appointment(@ApiParam(name = "id",value = "直播id", required = true) @PathVariable("id") String id) {
return R.ok(xiaoeLiveService.appointment(id));
}
-
+
/**
* 我的直播
+ *
* @param dto
* @return
*/
@ApiOperation("我的直播")
@PostMapping("/mine")
- public R<Page<XiaoeLiveVo>> minePage(@Valid @RequestBody XiaoeLiveQueryDto dto) {
+ public R<Page<XiaoeLiveVoV2>> minePage(@Valid @RequestBody XiaoeLiveQueryDto dto) {
return R.ok(xiaoeLiveService.getMineLivePage(dto));
}
@@ -94,7 +102,7 @@
* @return
*/
@ApiOperation("编辑直播")
- @PutMapping
+ @PostMapping
public R<Boolean> edit(@Valid @RequestBody XiaoeLiveDto dto) {
return R.ok(xiaoeLiveService.edit(dto));
}
--
Gitblit v1.7.1