From 8063ee7eee51bfe25a09428e6efc60f828b270c6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
index 1841afb..9ae68b3 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
@@ -1,27 +1,23 @@
package cn.lili.controller.lmk;
-import cn.lili.base.AbsQuery;
import cn.lili.group.Update;
import cn.lili.group.Add;
import cn.lili.modules.lmk.domain.form.VideoFootPrintForm;
import cn.lili.modules.lmk.domain.form.VideoHomePageInfoForm;
+import cn.lili.modules.lmk.domain.form.WxVideoForm;
import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
-import cn.lili.modules.member.entity.dos.FootPrint;
+import cn.lili.modules.lmk.domain.query.HealthVideoQuery;
+import cn.lili.modules.lmk.domain.query.WxHealthVideoQuery;
import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
import lombok.RequiredArgsConstructor;
import java.util.List;
-import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import cn.lili.modules.lmk.service.VideoService;
import cn.lili.base.Result;
-import cn.lili.modules.lmk.domain.form.VideoForm;
import cn.lili.modules.lmk.domain.query.VideoQuery;
-import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
/**
* 瑙嗛鍐呭 鍓嶇鎺у埗鍣�
@@ -40,20 +36,26 @@
@PostMapping("/publish")
@ApiOperation(value = "鍙戝竷瑙嗛", notes = "鍙戝竷瑙嗛")
- public Result publish(@RequestBody @Validated({Add.class}) VideoForm form) {
+ public Result publish(@RequestBody @Validated({Add.class}) WxVideoForm form) {
return videoService.publish(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) VideoForm form) {
- return videoService.update(form);
+ public Result update(@RequestBody @Validated(Update.class) WxVideoForm form) {
+ return videoService.updatePublish(form);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
public Result removeById(@PathVariable("id") String id) {
return videoService.removeById(id);
+ }
+
+ @PostMapping("/down/{id}")
+ @ApiOperation(value = "鐢ㄦ埛涓嬫灦瑙嗛", notes = "鐢ㄦ埛涓嬫灦瑙嗛")
+ public Result downVideo(@PathVariable("id") String id) {
+ return videoService.buyerDownVideo(id);
}
@DeleteMapping("/batch")
@@ -73,6 +75,17 @@
public Result recommendVideo(VideoQuery query) {
return videoService.recommendVideo(query);
}
+ @GetMapping("/health/recommend")
+ @ApiOperation(value = "澶у仴搴疯棰戞帹鑽�", notes = "澶у仴搴疯棰戞帹鑽�")
+ public Result healthRecommendVideo(WxHealthVideoQuery query) {
+ return videoService.healthRecommendVideo(query);
+ }
+
+ @GetMapping("/goods/detail/{videoId}")
+ @ApiOperation(value = "瑙嗛鍟嗗搧鏌ョ湅", notes = "瑙嗛鍟嗗搧鏌ョ湅")
+ public Result getGoodsDetail(@PathVariable("videoId") String videoId) {
+ return videoService.getGoodsDetail(videoId);
+ }
@PostMapping("/view/record")
@ApiOperation(value = "淇濆瓨瑙傜湅璁板綍", notes = "淇濆瓨瑙傜湅璁板綍")
--
Gitblit v1.8.0