视频列表

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tencentcloudapi.vod.v20180717.models.*;
 import com.wzj.soopin.content.domain.base.BaseInfoProperties;
-import com.wzj.soopin.content.mapper.MyLikedVlogMapper;
 import com.wzj.soopin.content.result.GraceJSONResult;
+import com.wzj.soopin.content.service.VlogService;
 import com.wzj.soopin.content.service.VlogUploadService;
 import com.wzj.soopin.content.utils.RedisOperator;
 import com.wzj.soopin.content.utils.TencentCloudUtil;
 import com.wzj.soopin.member.domain.vo.FansVO;
-import com.wzj.soopin.member.mapper.FansMapper;
 import com.wzj.soopin.member.service.IFansService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,11 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Api(tags = "管理端-视频上传接口")
@@ -35,46 +30,40 @@ public class VlogUploadController extends BaseInfoProperties {
     @Autowired
     private VlogUploadService vlogUploadService;
 
+    @Autowired
+    private VlogService vlogService;
+
     @Autowired
     private TencentCloudUtil tencentCloudUtil;
 
-    @Autowired
-    private com.wzj.soopin.content.mapper.VlogMapper vlogMapper;
-
-    @Autowired
-    private com.wzj.soopin.content.mapper.CommentMapper commentMapper;
-
     @Autowired
     private RedisOperator redis;
 
-    @Autowired
-    private MyLikedVlogMapper myLikedVlogMapper;
-
     @Autowired
     private IFansService fansService;
 
-
-
     @ApiOperation("获取腾讯云点播视频列表")
     @GetMapping("/list")
     public GraceJSONResult getVodList(
-            @ApiParam(value = "页码", defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
+            @ApiParam(value = "当前页码", defaultValue = "1") @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
-            @ApiParam(value = "每页记录数", defaultValue = "10") @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+            @ApiParam(value = "每页记录数", defaultValue = "10") @RequestParam(value = "size", required = false, defaultValue = "10") Integer size,
-            @ApiParam(value = "文件状态，可选值：Normal（正常）、SystemForbidden（平台封禁）、Forbidden（主动禁封）") @RequestParam(required = false) String[] status,
+            @ApiParam(value = "文件状态") @RequestParam(required = false) String[] status,
-            @ApiParam(value = "文件类型，可选值：Video（视频）、Audio（音频）、Image（图片）") @RequestParam(required = false) String[] categories,
+            @ApiParam(value = "文件类型") @RequestParam(required = false) String[] categories,
-            @ApiParam(value = "媒体文件来源，可选值：Upload（上传）、Record（直播录制）等") @RequestParam(required = false) String[] sourceTypes,
+            @ApiParam(value = "媒体文件来源") @RequestParam(required = false) String[] sourceTypes,
-            @ApiParam(value = "媒体文件封装格式，如：mp4、mov等") @RequestParam(required = false) String[] mediaTypes,
+            @ApiParam(value = "媒体文件封装格式") @RequestParam(required = false) String[] mediaTypes,
-            @ApiParam(value = "文件名，支持模糊搜索") @RequestParam(required = false) String[] names,
+            @ApiParam(value = "文件名") @RequestParam(required = false) String[] names,
             @ApiParam(value = "文件名前缀") @RequestParam(required = false) String[] namePrefixes,
-            @ApiParam(value = "文件描述，支持模糊搜索") @RequestParam(required = false) String[] descriptions,
+            @ApiParam(value = "文件描述") @RequestParam(required = false) String[] descriptions,
             @ApiParam(value = "标签") @RequestParam(required = false) String[] tags,
             @ApiParam(value = "分类ID") @RequestParam(required = false) Long[] classIds,
-            @ApiParam(value = "存储地区，如：ap-guangzhou") @RequestParam(required = false) String[] storageRegions,
+            @ApiParam(value = "存储地区") @RequestParam(required = false) String[] storageRegions,
-            @ApiParam(value = "创建时间范围-开始时间，格式：yyyy-MM-dd'T'HH:mm:ss'Z'") @RequestParam(required = false) String createTimeAfter,
+            @ApiParam(value = "创建时间范围-开始时间") @RequestParam(required = false) String createTimeAfter,
-            @ApiParam(value = "创建时间范围-结束时间，格式：yyyy-MM-dd'T'HH:mm:ss'Z'") @RequestParam(required = false) String createTimeBefore,
+            @ApiParam(value = "创建时间范围-结束时间") @RequestParam(required = false) String createTimeBefore,
-            @ApiParam(value = "排序字段，目前仅支持：CreateTime") @RequestParam(required = false, defaultValue = "CreateTime") String sortField,
+            @ApiParam(value = "排序字段", defaultValue = "CreateTime", allowableValues = "CreateTime,LikeCounts,CommentsCounts,Name,Status")
-            @ApiParam(value = "排序方式，可选值：Desc（降序）、Asc（升序）") @RequestParam(required = false, defaultValue = "Desc") String sortOrder,
+            @RequestParam(required = false, defaultValue = "CreateTime") String sortField,
-            @ApiParam(value = "需要返回的信息类型，可选值：basicInfo（基础信息）、metaData（元信息）、transcodeInfo（转码信息）等") @RequestParam(required = false) String[] filters) {
+            @ApiParam(value = "排序方式", defaultValue = "Asc", allowableValues = "Asc,Desc")
+            @RequestParam(required = false, defaultValue = "Asc") String sortOrder,
+            @ApiParam(value = "需要返回的信息类型") @RequestParam(required = false) String[] filters) {
         try {
             // 验证密钥配置
             String secretId = tencentCloudUtil.getSecretId();
@@ -84,12 +73,41 @@ public class VlogUploadController extends BaseInfoProperties {
                 return GraceJSONResult.errorMsg("腾讯云密钥未配置");
             }
 
+            // 验证分页参数
+            if (current < 1) {
+                current = 1;
+            }
+            if (size < 1 || size > 50) {
+                size = 10;
+            }
+
+            // 计算实际的offset
+            long offset = (long) ((current - 1) * size);
+            if (offset < 0) {
+                offset = 0;
+            }
+
+            // 打印分页参数
+            log.info("分页参数 - 当前页码: {}, 每页记录数: {}, 偏移量: {}", current, size, offset);
+            log.info("排序参数 - 排序字段: {}, 排序方式: {}", sortField, sortOrder);
+
+            // 验证排序参数
+            List<String> validSortFields = Arrays.asList("CreateTime", "LikeCounts", "CommentsCounts", "Name", "Status");
+            List<String> validSortOrders = Arrays.asList("Asc", "Desc");
+
+            if (!validSortFields.contains(sortField)) {
+                return GraceJSONResult.errorMsg("无效的排序字段，支持的字段有：" + String.join(",", validSortFields));
+            }
+            if (!validSortOrders.contains(sortOrder)) {
+                return GraceJSONResult.errorMsg("无效的排序方式，只能是 Asc(升序) 或 Desc(降序)");
+            }
+
             // 创建请求对象
             SearchMediaRequest req = new SearchMediaRequest();
 
             // 设置分页参数
-            req.setOffset((long) ((pageNum - 1) * pageSize));
+            req.setOffset(offset);
-            req.setLimit((long) pageSize);
+            req.setLimit((long) size);
 
             // 设置排序
             SortBy sort = new SortBy();
@@ -129,13 +147,14 @@ public class VlogUploadController extends BaseInfoProperties {
             // 调用腾讯云API获取视频列表
             log.info("开始调用腾讯云 SearchMedia API");
             SearchMediaResponse resp = vlogUploadService.searchMedia(req);
-            log.info("腾讯云 SearchMedia API 调用成功");
+            log.info("腾讯云 SearchMedia API 调用成功，总记录数: {}", resp.getTotalCount());
 
             // 处理响应结果
             Map<String, Object> result = new HashMap<>();
-            result.put("totalCount", resp.getTotalCount());
+            result.put("total", resp.getTotalCount());
-            result.put("pageNum", pageNum);
+            result.put("current", current);
-            result.put("pageSize", pageSize);
+            result.put("size", size);
+            result.put("pages", (resp.getTotalCount() + size - 1) / size); // 总页数
 
             List<Map<String, Object>> mediaList = new ArrayList<>();
             if (resp.getMediaInfoSet() != null) {
@@ -161,44 +180,21 @@ public class VlogUploadController extends BaseInfoProperties {
                     mediaMap.put("storageClass", basicInfo.getStorageClass());
                     mediaMap.put("tagSet", basicInfo.getTagSet());
 
-                    // 先通过fileId查询本地数据库获取视频信息
+                    // 获取视频统计信息
-                    com.wzj.soopin.content.domain.po.Vlog vlog = vlogMapper.selectByFileId(mediaInfo.getFileId());
+                    Map<String, Object> statistics = vlogService.getVlogStatistics(mediaInfo.getFileId());
-                    if (vlog != null) {
+                    mediaMap.putAll(statistics);
-                        mediaMap.put("vlogId", vlog.getId());
-                        mediaMap.put("title",vlog.getTitle());
-                        // 点赞数通过点赞表统计
-                        int likeCounts = myLikedVlogMapper.countLikesByVlogId(vlog.getId());
-                        mediaMap.put("likeCounts", likeCounts);
-                        // 评论数
-                        Integer commentCount = commentMapper.countByVlogId(vlog.getId());
-                        mediaMap.put("commentCounts", commentCount);
 
-                        // 获取粉丝数量：优先 Redis，无则 MySQL
+                    // 获取视频上传者信息
-                        String fansCountsStr = redis.get(REDIS_MY_FANS_COUNTS + ":" + vlog.getVlogerId());
+                    Map<String, String> uploaderInfo = vlogService.getVlogUploaderInfo(mediaInfo.getFileId());
-                        Integer fansCounts = 0;
+                    if (uploaderInfo != null) {
-                        if (StringUtils.isNotBlank(fansCountsStr)) {
+                        mediaMap.put("nickname", uploaderInfo.get("name"));
-                            fansCounts = Integer.valueOf(fansCountsStr);
+                        mediaMap.put("mobile", uploaderInfo.get("phone"));
-                        } else {
-                            // Redis 中没有，从数据库查询
-                            fansCounts = fansService.countFansByVlogerId(vlog.getVlogerId());
-                            // 可以选择在这里将数据库查询结果写入 Redis，以便下次使用
-                            if (fansCounts != null) {
-                                redis.set(REDIS_MY_FANS_COUNTS + ":" + vlog.getVlogerId(), String.valueOf(fansCounts));
-                            }
-                        }
-                        mediaMap.put("fansCounts", fansCounts);
-
-                    } else {
-                        mediaMap.put("vlogId", null);
-                        mediaMap.put("likeCounts", 0);
-                        mediaMap.put("commentCounts", 0);
-                        mediaMap.put("fansCounts", 0);
                     }
 
                     mediaList.add(mediaMap);
                 }
             }
-            result.put("list", mediaList);
+            result.put("records", mediaList); // 改为 records 以匹配前端预期
 
             return GraceJSONResult.ok(result);
         } catch (Exception e) {
@@ -243,48 +239,14 @@ public class VlogUploadController extends BaseInfoProperties {
     @GetMapping("/detail")
     public GraceJSONResult vlogDetail(@RequestParam String fileId) {
         try {
-            // 先通过fileId查询本地数据库获取vlog信息
+            // 获取视频基本信息
-            com.wzj.soopin.content.domain.po.Vlog vlog = vlogMapper.selectByFileId(fileId);
+            Map<String, Object> result = vlogService.getVlogDetailInfo(fileId);
-            Map<String, Object> result = new HashMap<>();
 
-            if (vlog != null) {
+            // 获取视频上传者信息
-                log.info("找到视频信息: vlogId={}, fileId={}", vlog.getId(), fileId);
+            Map<String, String> uploaderInfo = vlogService.getVlogUploaderInfo(fileId);
-                // 如果找到vlog信息，使用fileId查询腾讯云
+            if (uploaderInfo != null) {
-                Object vodDetail = vlogUploadService.getVlogDetail(fileId);
+                result.put("uploaderName", uploaderInfo.get("name"));
-                if (vodDetail instanceof Map) {
+                result.put("uploaderPhone", uploaderInfo.get("phone"));
-                    result.putAll((Map<String, Object>) vodDetail);
-                } else {
-                    result.put("vodDetail", vodDetail);
-                }
-                // 添加评论信息
-                List<Map<String, Object>> comments = commentMapper.selectCommentsByVlogId(vlog.getId());
-                result.put("comments", comments);
-                // 添加点赞数（通过点赞表统计）
-                int likeCounts = myLikedVlogMapper.countLikesByVlogId(vlog.getId());
-                result.put("likeCounts", likeCounts);
-                result.put("vlogId", vlog.getId());
-                // 查询点赞用户信息
-                List<Map<String, Object>> likedUsers = myLikedVlogMapper.selectLikedUsersByVlogId(vlog.getId());
-                result.put("likedUsers", likedUsers);
-
-
-                IPage<FansVO> fansList = fansService.queryMyFans(vlog.getVlogerId(),0,10);
-                result.put("fansList", fansList);
-
-            } else {
-                log.info("未找到视频信息, fileId={}", fileId);
-                // 如果没有找到vlog信息，只返回腾讯云视频信息
-                Object vodDetail = vlogUploadService.getVlogDetail(fileId);
-                if (vodDetail instanceof Map) {
-                    result.putAll((Map<String, Object>) vodDetail);
-                } else {
-                    result.put("vodDetail", vodDetail);
-                }
-                // 设置默认值
-                result.put("comments", Collections.emptyList());
-                result.put("likeCounts", 0);
-                result.put("likedUsers", Collections.emptyList());
-                result.put("fansList", Collections.emptyList());
             }
 
             return GraceJSONResult.ok(result);
@@ -293,6 +255,7 @@ public class VlogUploadController extends BaseInfoProperties {
             return GraceJSONResult.errorMsg("获取视频详情失败: " + e.getMessage());
         }
     }
+
     @ApiOperation(value = "禁播/解禁视频", notes = "禁播/解禁视频接口")
     @PostMapping("/forbid")
     public GraceJSONResult forbidMediaDistribution(@RequestBody Map<String, Object> params) {
@@ -339,4 +302,25 @@ public class VlogUploadController extends BaseInfoProperties {
             return GraceJSONResult.errorMsg("操作失败: " + e.getMessage());
         }
     }
+
+    @ApiOperation(value = "根据vlogerId查询用户信息", notes = "查询视频上传者的姓名和电话")
+    @GetMapping("/user-info")
+    public GraceJSONResult getUserInfoByVlogerId(@RequestParam String vlogerId) {
+        try {
+            if (StringUtils.isBlank(vlogerId)) {
+                return GraceJSONResult.errorMsg("vlogerId不能为空");
+            }
+
+            // 获取视频上传者信息
+            Map<String, String> uploaderInfo = vlogService.getVlogUploaderInfo(vlogerId);
+            if (uploaderInfo == null || uploaderInfo.isEmpty()) {
+                return GraceJSONResult.errorMsg("未找到对应的用户信息");
+            }
+
+            return GraceJSONResult.ok(uploaderInfo);
+        } catch (Exception e) {
+            log.error("获取用户信息失败", e);
+            return GraceJSONResult.errorMsg("获取用户信息失败: " + e.getMessage());
+        }
+    }
 }

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/VlogService.java

@@ -1,10 +1,14 @@
 package com.wzj.soopin.content.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.wzj.soopin.content.domain.bo.VlogBO;
 import com.wzj.soopin.content.domain.po.Vlog;
 import com.wzj.soopin.content.domain.vo.IndexVlogVO;
 import com.wzj.soopin.content.utils.PagedGridResult;
 
+import java.util.List;
+import java.util.Map;
+
 public interface VlogService {
     /**
      * 修改视频首帧图
@@ -100,72 +104,41 @@ public interface VlogService {
      * 把counts输入数据库
      */
     public void flushCounts(String vlogId, Integer counts);
-//    /**
+
-//     * 查询首页/搜索的vlog列表
+    /**
-//     */
+     * 通过 fileId 获取视频信息
-//    public PagedGridResult getIndexVlogList(String userId,
+     */
-//                                            String search,
+    Vlog getVlogByFileId(String fileId);
-//                                            Integer page,
+
-//                                            Integer pageSize);
+    /**
-//
+     * 获取视频统计信息
-//    /**
+     */
-//     * 根据视频主键查询vlog
+    Map<String, Object> getVlogStatistics(String fileId);
-//     */
+
-//    public IndexVlogVO getVlogDetailById(String userId, String vlogId);
+    /**
-//
+     * 获取视频详细信息
-//    /**
+     */
-//     * 用户把视频改为公开/私密的视频
+    Map<String, Object> getVlogDetailInfo(String fileId);
-//     */
+
-//    public void changeToPrivateOrPublic(String userId,
+    /**
-//                                        String vlogId,
+     * 获取视频评论列表
-//                                        Integer yesOrNo);
+     */
-//
+    List<Map<String, Object>> getVlogComments(String vlogId);
-//    /**
+
-//     * 查询用的公开/私密的视频列表
+    /**
-//     */
+     * 获取视频点赞用户列表
-//    public PagedGridResult queryMyVlogList(String userId,
+     */
-//                                Integer page,
+    List<Map<String, Object>> getLikedUsers(String vlogId);
-//                                Integer pageSize,
+
-//                                Integer yesOrNo);
+    /**
-//
+     * 获取视频点赞数
-//    /**
+     */
-//     * 用户点赞/喜欢视频
+    int getLikeCounts(String vlogId);
-//     */
+
-//    public void userLikeVlog(String userId, String vlogId);
+    /**
-//
+     * 获取视频上传者信息
-//    /**
+     * @param fileId 视频文件ID
-//     * 用户取消点赞/喜欢视频
+     * @return 包含上传者姓名和手机号的Map
-//     */
+     */
-//    public void userUnLikeVlog(String userId, String vlogId);
+    Map<String, String> getVlogUploaderInfo(String fileId);
-//
-//    /**
-//     * 获得用户点赞视频的总数
-//     */
-//    public Integer getVlogBeLikedCounts(String vlogId);
-//
-//    /**
-//     * 查询用户点赞过的短视频
-//     */
-//    public PagedGridResult getMyLikedVlogList(String userId,
-//                                           Integer page,
-//                                           Integer pageSize);
-//
-//    /**
-//     * 查询用户关注的博主发布的短视频列表
-//     */
-//    public PagedGridResult getMyFollowVlogList(String myId,
-//                                              Integer page,
-//                                              Integer pageSize);
-//
-//    /**
-//     * 查询朋友发布的短视频列表
-//     */
-//    public PagedGridResult getMyFriendVlogList(String myId,
-//                                               Integer page,
-//                                               Integer pageSize);
-//
-//    /**
-//     * 根据主键查询vlog
-//     */
-//    public Vlog getVlog(String id);
 }

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java

@@ -10,15 +10,21 @@ import com.wzj.soopin.content.domain.base.BaseInfoProperties;
 import com.wzj.soopin.content.domain.bo.VlogBO;
 import com.wzj.soopin.content.domain.po.MyLikedVlog;
 import com.wzj.soopin.content.domain.po.Vlog;
+import com.wzj.soopin.content.domain.po.Users;
 import com.wzj.soopin.content.domain.vo.IndexVlogVO;
 import com.wzj.soopin.content.enums.YesOrNo;
+import com.wzj.soopin.content.mapper.CommentMapper;
 import com.wzj.soopin.content.mapper.MyLikedVlogMapper;
+import com.wzj.soopin.content.mapper.UsersMapper;
 import com.wzj.soopin.content.mapper.VlogMapper;
 import com.wzj.soopin.content.mapper.VlogMapperCustom;
 import com.wzj.soopin.content.service.MsgService;
 import com.wzj.soopin.content.service.VlogService;
 import com.wzj.soopin.content.utils.PagedGridResult;
+import com.wzj.soopin.content.utils.RedisOperator;
 import com.wzj.soopin.content.utils.Sid;
+import com.wzj.soopin.content.utils.TencentCloudUtil;
+import com.wzj.soopin.member.domain.vo.FansVO;
 import com.wzj.soopin.member.service.IFansService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -44,6 +50,14 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
     private MsgService msgService;
     @Autowired
     private Sid sid;
+    @Autowired
+    private CommentMapper commentMapper;
+    @Autowired
+    private RedisOperator redis;
+    @Autowired
+    private TencentCloudUtil tencentCloudUtil;
+    @Autowired
+    private UsersMapper usersMapper;
 
     @Transactional
     @Override
@@ -352,4 +366,141 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
 
         return null;
     }
+
+    @Override
+    public Vlog getVlogByFileId(String fileId) {
+        return vlogMapper.selectByFileId(fileId);
+    }
+
+    @Override
+    public Map<String, Object> getVlogStatistics(String fileId) {
+        Map<String, Object> result = new HashMap<>();
+
+        // 获取视频基本信息
+        Vlog vlog = vlogMapper.selectByFileId(fileId);
+        if (vlog != null) {
+            result.put("vlogId", vlog.getId());
+            result.put("title", vlog.getTitle());
+            result.put("width",vlog.getWidth());
+            result.put("height",vlog.getHeight());
+
+            // 点赞数通过点赞表统计
+            int likeCounts = myLikedVlogMapper.countLikesByVlogId(vlog.getId());
+            result.put("likeCounts", likeCounts);
+
+            // 评论数
+            Integer commentCount = commentMapper.countByVlogId(vlog.getId());
+            result.put("commentCounts", commentCount);
+
+            // 获取粉丝数量：优先 Redis，无则 MySQL
+            String fansCountsStr = redis.get(REDIS_MY_FANS_COUNTS + ":" + vlog.getVlogerId());
+            Integer fansCounts = 0;
+            if (StringUtils.isNotBlank(fansCountsStr)) {
+                fansCounts = Integer.valueOf(fansCountsStr);
+            } else {
+//                fansCounts = fansService.countFansByVlogerId(vlog.getVlogerId());
+//                if (fansCounts != null) {
+//                    redis.set(REDIS_MY_FANS_COUNTS + ":" + vlog.getVlogerId(), String.valueOf(fansCounts));
+//                }
+            }
+            result.put("fansCounts", fansCounts);
+        } else {
+            result.put("vlogId", null);
+            result.put("likeCounts", 0);
+            result.put("commentCounts", 0);
+            result.put("fansCounts", 0);
+        }
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getVlogDetailInfo(String fileId) {
+        Map<String, Object> result = new HashMap<>();
+
+        // 获取视频基本信息
+        Vlog vlog = vlogMapper.selectByFileId(fileId);
+        if (vlog != null) {
+            // 如果找到vlog信息，使用fileId查询腾讯云
+//            Object vodDetail = tencentCloudUtil.getVodMediaInfo(fileId);
+//            if (vodDetail instanceof Map) {
+//                result.putAll((Map<String, Object>) vodDetail);
+//            } else {
+//                result.put("vodDetail", vodDetail);
+//            }
+
+            // 添加评论信息
+            List<Map<String, Object>> comments = commentMapper.selectCommentsByVlogId(vlog.getId());
+            result.put("comments", comments);
+
+            // 添加点赞数和点赞用户信息
+            int likeCounts = myLikedVlogMapper.countLikesByVlogId(vlog.getId());
+            result.put("likeCounts", likeCounts);
+            result.put("vlogId", vlog.getId());
+
+            List<Map<String, Object>> likedUsers = myLikedVlogMapper.selectLikedUsersByVlogId(vlog.getId());
+            result.put("likedUsers", likedUsers);
+
+            // 添加粉丝列表
+//            Page<FansVO> fansPage = fansService.queryMyFans(vlog.getVlogerId(), 0, 10);
+//            result.put("fansList", fansPage);
+        } else {
+            // 如果没有找到vlog信息，只返回腾讯云视频信息
+//            Object vodDetail = tencentCloudUtil.getVodMediaInfo(fileId);
+//            if (vodDetail instanceof Map) {
+//                result.putAll((Map<String, Object>) vodDetail);
+//            } else {
+//                result.put("vodDetail", vodDetail);
+//            }
+            // 设置默认值
+            result.put("comments", Collections.emptyList());
+            result.put("likeCounts", 0);
+            result.put("likedUsers", Collections.emptyList());
+            result.put("fansList", Collections.emptyList());
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<Map<String, Object>> getVlogComments(String vlogId) {
+        return commentMapper.selectCommentsByVlogId(vlogId);
+    }
+
+    @Override
+    public List<Map<String, Object>> getLikedUsers(String vlogId) {
+        return myLikedVlogMapper.selectLikedUsersByVlogId(vlogId);
+    }
+
+    @Override
+    public int getLikeCounts(String vlogId) {
+        return myLikedVlogMapper.countLikesByVlogId(vlogId);
+    }
+
+    @Override
+    public Map<String, String> getVlogUploaderInfo(String fileId) {
+        // 通过 fileId 获取视频信息
+        Vlog vlog = vlogMapper.selectByFileId(fileId);
+        if (vlog == null) {
+            return null;
+        }
+
+        // 获取上传者ID
+        String uploaderId = vlog.getVlogerId();
+        if (uploaderId == null) {
+            return null;
+        }
+
+        // 从 t_users 表获取用户信息
+        Users user = usersMapper.selectById(uploaderId);
+        if (user == null) {
+            return null;
+        }
+
+        Map<String, String> result = new HashMap<>();
+        result.put("name", user.getNickname());
+        result.put("phone", user.getMobile());
+
+        return result;
+    }
 }

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/utils/TencentCloudProperties.java

@@ -33,10 +33,10 @@ public class TencentCloudProperties {
     /**
      * 点播配置
      */
-    private Vod vod = new Vod();
+    private VodProperties vod = new VodProperties();
 
     @Data
-    public static class Vod {
+    public static class VodProperties {
         /**
          * 应用ID
          */

ruoyi-modules/ruoyi-content/src/main/resources/db/migration/V1.0.1__add_remark_column.sql

@@ -0,0 +1,2 @@
+ALTER TABLE t_vlog
+ADD COLUMN remark varchar(500) DEFAULT NULL COMMENT '备注'; 

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IFansService.java

@@ -31,5 +31,5 @@ public interface IFansService {
                                        Integer pageSize);
 
 
-    Integer countFansByVlogerId(String vlogerId);
+//    Integer countFansByVlogerId(String vlogerId);
 }

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/FansServiceImpl.java

@@ -108,8 +108,8 @@ public class FansServiceImpl extends ServiceImpl<FansMapper, Fans> implements IF
         return null;
     }
 
-    @Override
+//    @Override
-    public Integer countFansByVlogerId(String vlogerId) {
+//    public Integer countFansByVlogerId(String vlogerId) {
-       return baseMapper.countFansByVlogerId(vlogerId);
+//       return baseMapper.countFansByVlogerId(vlogerId);
-    }
+//    }
 }