From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 manager-api/src/main/java/cn/lili/controller/lmk/VideoTagController.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/VideoTagController.java b/manager-api/src/main/java/cn/lili/controller/lmk/VideoTagController.java
index 3c4c400..da5b57d 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/VideoTagController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/VideoTagController.java
@@ -2,6 +2,11 @@
 
 import cn.lili.group.Update;
 import cn.lili.group.Add;
+import cn.lili.modules.lmk.domain.form.WxVideoForm;
+import cn.lili.modules.lmk.domain.query.VideoGoodsEsQuery;
+import cn.lili.modules.lmk.domain.query.WxVideoTagQuery;
+import cn.lili.modules.lmk.service.VideoService;
+import cn.lili.modules.search.service.EsGoodsSearchService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
 import lombok.RequiredArgsConstructor;
@@ -31,7 +36,17 @@
 public class VideoTagController {
 
     private final VideoTagService videoTagService;
-
+    private final EsGoodsSearchService goodsSearchService;
+    @GetMapping("/recommend")
+    @ApiOperation(value = "鎺ㄨ崘鏍囩", notes = "鎺ㄨ崘鏍囩")
+    public Result recommend(WxVideoTagQuery query) {
+        return videoTagService.recommend(query);
+    }
+    @ApiOperation(value = "鍟嗗搧鍒嗛〉-鍙戝竷瑙嗛鏃跺叧鑱斿晢鍝�")
+    @GetMapping("/video/es")
+    public Result videoGoodsEsPage(VideoGoodsEsQuery query) {
+        return goodsSearchService.videoGoodsEsPage(query);
+    }
     @PostMapping
     @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
     public Result add(@RequestBody @Validated(Add.class) VideoTagForm form) {

--
Gitblit v1.8.0