From adb23bb268600d74de84fe42118051b07f1de851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E4=BD=B3=E8=B1=AA?= <18505142974@163.com>
Date: Sat, 16 Aug 2025 11:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/app/AppVlogController.java    | 56 +++++++++++++++++--
 .../system/domain/vo/SysMessageVo.java        |  3 +-
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java
index 882323141..e7f4d48d0 100644
--- a/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java
@@ -16,6 +16,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,6 +28,7 @@ import java.util.Map;
 
 import static com.wzj.soopin.content.domain.base.BaseInfoProperties.*;
 
+
 @Slf4j
 @Api(tags = "VlogController 短视频相关业务功能的接口")
 @RequestMapping("/app/vlog")
@@ -53,6 +57,11 @@ public class AppVlogController {
     @Tag(name = "我的私密视频列表")
     @PostMapping("/myPrivateList")
     public R<PagedGridResult> myPrivateList(@RequestBody MyListBO bo, @RequestBody Page page) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        bo.setUserId(String.valueOf(loginUser.getUserId()));
         PagedGridResult pages = vlogService.queryMyVlogList(bo, page);
         return R.ok(pages);
     }
@@ -60,6 +69,11 @@ public class AppVlogController {
     @Tag(name = "我点赞的视频列表")
     @PostMapping("/myLikedList")
     public R<PagedGridResult> myLikedList(@RequestBody MyListBO bo, @RequestBody Page page) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        bo.setUserId(String.valueOf(loginUser.getUserId()));
         PagedGridResult pages = vlogService.getMyLikedVlogList(bo, page);
         return R.ok(pages);
     }
@@ -67,6 +81,11 @@ public class AppVlogController {
     @Tag(name = "我关注的视频列表")
     @PostMapping("/followList")
     public R<PagedGridResult> followList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        bo.setMyId(String.valueOf(loginUser.getUserId()));
         PagedGridResult pages = vlogService.getMyFollowVlogList(bo, page);
         return R.ok(pages);
     }
@@ -74,6 +93,11 @@ public class AppVlogController {
     @Tag(name = "好友视频列表")
     @PostMapping("/friendList")
     public R<PagedGridResult> friendList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        bo.setMyId(String.valueOf(loginUser.getUserId()));
         PagedGridResult pages = vlogService.getMyFriendVlogList(bo, page);
         return R.ok(pages);
     }
@@ -109,9 +133,19 @@ public class AppVlogController {
 
 
     @PostMapping("like")
-    public R<Void> like(@RequestParam String userId,
-                        @RequestParam String vlogerId,
-                        @RequestParam String vlogId) {
+    public R<Void> like(@RequestBody Map<String, String> params) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        
+        String userId = String.valueOf(loginUser.getUserId());
+        String vlogerId = params.get("vlogerId");
+        String vlogId = params.get("vlogId");
+        
+        if (StringUtils.isBlank(vlogerId) || StringUtils.isBlank(vlogId)) {
+            throw new ServiceException("参数不完整");
+        }
 
         // 我点赞的视频，关联关系保存到数据库
         vlogService.userLikeVlog(userId, vlogId);
@@ -141,9 +175,19 @@ public class AppVlogController {
 
 
     @PostMapping("unlike")
-    public R<Void> unlike(@RequestParam String userId,
-                          @RequestParam String vlogerId,
-                          @RequestParam String vlogId) {
+    public R<Void> unlike(@RequestBody Map<String, String> params) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("用户未登录");
+        }
+        
+        String userId = String.valueOf(loginUser.getUserId());
+        String vlogerId = params.get("vlogerId");
+        String vlogId = params.get("vlogId");
+        
+        if (StringUtils.isBlank(vlogerId) || StringUtils.isBlank(vlogId)) {
+            throw new ServiceException("参数不完整");
+        }
 
         // 我取消点赞的视频，关联关系删除
         vlogService.userUnLikeVlog(userId, vlogId);
diff --git a/ruoyi-modules/ruoyi-im/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java b/ruoyi-modules/ruoyi-im/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java
index 4c1c7feba..6b2dca0ac 100644
--- a/ruoyi-modules/ruoyi-im/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java
+++ b/ruoyi-modules/ruoyi-im/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java
@@ -4,7 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.system.domain.SysMessage;
+import org.dromara.system.domain
+    .SysMessage;
 import org.dromara.system.domain.SysNotice;
 
 import java.io.Serial;