From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java |   46 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 39 insertions(+), 7 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 450d331..32fc3b6 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,20 +1,22 @@
 package cn.lili.controller.lmk;
 
-import cn.lili.group.Update;
+import cn.lili.base.Result;
 import cn.lili.group.Add;
+import cn.lili.group.Update;
+import cn.lili.modules.lmk.domain.form.ThumbsUpRecordForm;
 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.*;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import javax.validation.constraints.NotEmpty;
+import cn.lili.modules.lmk.service.VideoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import cn.lili.modules.lmk.service.VideoService;
-import cn.lili.base.Result;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * 瑙嗛鍐呭 鍓嶇鎺у埗鍣�
@@ -118,6 +120,12 @@
         return videoService.getAuthorCollectVideoPage(query);
     }
 
+    @GetMapping("/author-like-video-page")
+    @ApiOperation(value = "鑾峰彇瑙嗛涓婚〉浣滆�呯偣璧炵殑瑙嗛鍒嗛〉", notes = "鑾峰彇瑙嗛涓婚〉浣滆�呯偣璧炵殑瑙嗛鍒嗛〉")
+    public Result getAuthorLikeVideoPage(AuthorVideoQuery query) {
+        return videoService.getAuthorLikeVideoPage(query);
+    }
+
     @PostMapping("/home-page-info-edit")
     @ApiOperation(value = "淇濆瓨瑙嗛涓婚〉鐨勪釜浜轰俊鎭慨鏀�", notes = "淇濆瓨瑙嗛涓婚〉鐨勪釜浜轰俊鎭慨鏀�")
     public Result homePageInfoEdit(@RequestBody @Validated VideoHomePageInfoForm form) {
@@ -129,4 +137,28 @@
     public Result wxDetail(@PathVariable("id") String id) {
         return videoService.wxDetail(id);
     }
+
+    @PostMapping("/change/thumbs-up")
+    @ApiOperation(value = "鐐硅禐/鍙栨秷鐐硅禐瑙嗛", notes = "鐐硅禐/鍙栨秷鐐硅禐瑙嗛")
+    public Result changeThumbsUp(@RequestBody @Validated(Add.class) ThumbsUpRecordForm form) {
+        return videoService.changeThumbsUp(form);
+    }
+
+    @GetMapping("/es/search")
+    @ApiOperation(value = "瑙嗛鎼滅储", notes = "瑙嗛鎼滅储")
+    public Result esSearch(VideoEsQuery query) {
+        return videoService.esSearch(query);
+    }
+
+    @PostMapping("/goods/similarly")
+    @ApiOperation(value = "鎸傜浉鍚屽晢鍝佺殑瑙嗛", notes = "鎸傜浉鍚屽晢鍝佺殑瑙嗛")
+    public Result goodsSimilarly(@RequestBody VideoQuery query) {
+        return videoService.recommendVideo(query);
+    }
+
+    @GetMapping("/history")
+    @ApiOperation(value = "鑾峰彇鍘嗗彶鎾斁璁板綍")
+    public Result getHistoryPage(VideoHistoryQuery query) {
+        return videoService.getHistoryPage(query);
+    }
 }

--
Gitblit v1.8.0