소스 검색

播放进度ok

xiang 5 일 전
부모
커밋
ec7857382e

+ 61 - 1
artist/artist.sql

@@ -101,4 +101,64 @@ CREATE TABLE `user_favorite_artist` (
                                         UNIQUE KEY `uk_user_artist` (`user_id`, `artist_id`),
                                         INDEX `idx_user_id` (`user_id`), -- 逻辑关联索引
                                         INDEX `idx_artist_id` (`artist_id`) -- 逻辑关联索引
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='我喜欢的歌手表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='我喜欢的歌手表';
+
+
+
+DROP TABLE IF EXISTS `share`;
+CREATE TABLE `share` (
+                         `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '分享ID,主键',
+                         `user_id` VARCHAR(64) NOT NULL COMMENT '发表分享的用户ID',
+                         `content` TEXT COMMENT '分享正文内容(支持富文本或纯文本)',
+                         `jump_urls` TEXT COMMENT '图片跳转', -- 移除 DEFAULT '[]',解决1101错误
+                         `files` JSON COMMENT '图片文件',    -- 移除 DEFAULT '[]',解决1101错误
+                         `like_count` INT DEFAULT 0 COMMENT '点赞数',
+                         `unlike_count` INT DEFAULT 0 COMMENT '点踩数',
+                         `is_forward` BOOLEAN DEFAULT FALSE COMMENT '是否转发',
+                         `forward_count` INT DEFAULT 0 COMMENT '转发数',
+                         `comment_count` INT DEFAULT 0 COMMENT '评论数',
+                         `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                         `updated_at` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                         PRIMARY KEY (`id`),
+                         INDEX `idx_user_id` (`user_id`),
+                         INDEX `idx_created_at` (`created_at`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='分享表';
+
+
+-- 点赞记录表
+CREATE TABLE `share_like_record` (
+                                     `id` INT AUTO_INCREMENT PRIMARY KEY,
+                                     `share_id` BIGINT NOT NULL COMMENT '分享ID,关联share表',
+                                     `user_id` INT NOT NULL COMMENT '点赞用户ID,关联user表',
+                                     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '点赞时间',
+                                     UNIQUE KEY `uk_share_user` (`share_id`, `user_id`), -- 一个用户对一个分享只能点赞一次
+                                     INDEX `idx_share_id` (`share_id`),
+                                     INDEX `idx_user_id` (`user_id`),
+                                     FOREIGN KEY (`share_id`) REFERENCES `share` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='分享点赞记录表';
+
+-- 踩记录表
+CREATE TABLE `share_dislike_record` (
+                                        `id` INT AUTO_INCREMENT PRIMARY KEY,
+                                        `share_id` BIGINT NOT NULL COMMENT '分享ID,关联share表',
+                                        `user_id` INT NOT NULL COMMENT '点踩用户ID,关联user表',
+                                        `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '点踩时间',
+                                        UNIQUE KEY `uk_share_user` (`share_id`, `user_id`), -- 一个用户对一个分享只能踩一次
+                                        INDEX `idx_share_id` (`share_id`),
+                                        INDEX `idx_user_id` (`user_id`),
+                                        FOREIGN KEY (`share_id`) REFERENCES `share` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='分享点踩记录表';
+
+-- 转发记录表
+CREATE TABLE `share_forward_record` (
+                                        `id` INT AUTO_INCREMENT PRIMARY KEY,
+                                        `share_id` BIGINT NOT NULL COMMENT '原分享ID,关联share表',
+                                        `user_id` INT NOT NULL COMMENT '转发用户ID,关联user表',
+                                        `target_share_id` BIGINT COMMENT '转发后生成的新分享ID(如果转发后用户添加了内容)',
+                                        `forward_content` TEXT COMMENT '转发时添加的内容',
+                                        `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '转发时间',
+                                        INDEX `idx_share_id` (`share_id`),
+                                        INDEX `idx_user_id` (`user_id`),
+                                        INDEX `idx_target_share_id` (`target_share_id`),
+                                        FOREIGN KEY (`share_id`) REFERENCES `share` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='分享转发记录表';

+ 6 - 2
artist/src/main/java/com/artist/controller/ArtistController.java

@@ -17,8 +17,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -128,4 +126,10 @@ public class ArtistController {
         stringRedisTemplate.opsForValue().set(RedisConstant.ARTIST_QUERY_SINGER_BY_ID_PREFIX+  id, JSON.toJSONString(artist), 24, TimeUnit.HOURS);
         return Result.success(artist);
     }
+    //歌手推荐
+    @GetMapping("recommend")
+    @PreAuthorize("hasRole('ROLE_USER')")
+    public Result recommend() {
+        return Result.success(artistService.recommend());
+    }
 }

+ 0 - 1
artist/src/main/java/com/artist/controller/ArtistRealAuthController.java

@@ -10,7 +10,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 

+ 6 - 1
artist/src/main/java/com/artist/controller/UserFavoriteArtistController.java

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -114,5 +113,11 @@ public class UserFavoriteArtistController {
                 .collect(Collectors.toList());
         return Result.success(result);
     }
+    @GetMapping("/queryfavoriteArtistList")
+    @PreAuthorize("hasRole('ROLE_USER')")
+    public Result queryfavoriteArtistList(@RequestParam Integer id) {
+        List<Integer> list = userFavoriteArtistService.selfavorityList(id);
+        return Result.success(list);
+    }
 
 }

+ 0 - 1
artist/src/main/java/com/artist/feignclient/AlbumServiceClient.java

@@ -6,7 +6,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @FeignClient(value = "content",fallbackFactory = ContentServiceClientFallbackFactory.class)

+ 11 - 0
artist/src/main/java/com/artist/mapper/ArtistMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * <p>
  * 艺人基础信息表 Mapper 接口
@@ -45,4 +47,13 @@ public interface ArtistMapper extends BaseMapper<Artist> {
     })
     MusicianApplicationDTO getArtistApplicationInfoByUserId(@Param("userId") Integer userId);
 
+    // 在ArtistMapper接口中添加
+    @Select("SELECT a.* FROM artist a " +
+            "WHERE a.status = 1 " +
+            "AND a.id NOT IN (" +
+            "    SELECT ufa.artist_id FROM user_favorite_artist ufa " +
+            "    WHERE ufa.user_id = #{userId}" +
+            ") " +
+            "ORDER BY RAND() LIMIT 2")
+    List<Artist> selectRandomUnfollowedArtists(@Param("userId") Integer userId);
 }

+ 2 - 0
artist/src/main/java/com/artist/mapper/UserFavoriteArtistMapper.java

@@ -19,4 +19,6 @@ import java.util.List;
 public interface UserFavoriteArtistMapper extends BaseMapper<UserFavoriteArtist> {
     @Select("SELECT * FROM artist WHERE id IN (SELECT artist_id FROM user_favorite_artist WHERE user_id = #{id})")
     List<Artist> queryById(Integer id);
+
+    List<Integer>  queryFavorityById(Integer id);
 }

+ 4 - 0
artist/src/main/java/com/artist/service/IArtistService.java

@@ -4,6 +4,8 @@ import com.artist.domain.dto.MusicianApplicationDTO;
 import com.artist.domain.po.Artist;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 艺人基础信息表 服务类
@@ -20,4 +22,6 @@ public interface IArtistService extends IService<Artist> {
     void updateArtistApply(Integer id, Integer status, String reason);
 
     MusicianApplicationDTO getMusicianApplicationInfo(Integer userId);
+
+    List<Artist> recommend();
 }

+ 2 - 0
artist/src/main/java/com/artist/service/IUserFavoriteArtistService.java

@@ -16,4 +16,6 @@ import java.util.List;
  */
 public interface IUserFavoriteArtistService extends IService<UserFavoriteArtist> {
     List<Artist> queryById(Integer id);
+
+    List<Integer> selfavorityList(java.lang.Integer id);
 }

+ 12 - 2
artist/src/main/java/com/artist/service/impl/ArtistServiceImpl.java

@@ -1,6 +1,7 @@
 package com.artist.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.artist.config.SecurityUtil;
 import com.artist.domain.dto.MusicianApplicationDTO;
 import com.artist.domain.po.*;
 import com.artist.mapper.ArtistMapper;
@@ -10,7 +11,6 @@ import com.artist.service.IArtistRealAuthService;
 import com.artist.service.IArtistService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.base.exception.WyMusicException;
-import com.base.utils.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -167,4 +167,14 @@ public class ArtistServiceImpl extends ServiceImpl<ArtistMapper, Artist> impleme
     public MusicianApplicationDTO getMusicianApplicationInfo(Integer userId) {
         return artistMapper.getArtistApplicationInfoByUserId(userId);
     }
+
+    @Override
+    public List<Artist> recommend() {
+        Integer id = SecurityUtil.getUser().getId();
+
+        // 查询当前用户未关注的艺人,随机推荐2个
+        return artistMapper.selectRandomUnfollowedArtists(id);
+    }
+
+
 }

+ 6 - 0
artist/src/main/java/com/artist/service/impl/UserFavoriteArtistServiceImpl.java

@@ -26,4 +26,10 @@ private UserFavoriteArtistMapper userFavoriteArtistMapper;
         List<Artist> artists = userFavoriteArtistMapper.queryById(id);
         return artists;
     }
+
+    @Override
+    public List<Integer> selfavorityList(Integer id) {
+        List<Integer>  list=userFavoriteArtistMapper.queryFavorityById( id);
+        return list;
+    }
 }

+ 3 - 0
artist/src/main/resources/mapper/UserFavoriteArtistMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.artist.mapper.UserFavoriteArtistMapper">
 
+    <select id="queryFavorityById" resultType="java.lang.Integer">
+        select artist_id from user_favorite_artist where user_id = #{id}
+    </select>
 </mapper>

+ 2 - 0
base/src/main/java/com/base/common/RedisConstant.java

@@ -11,4 +11,6 @@ public class RedisConstant {
         public static final String PLAYLIST_ALL_ALBUM = "playlist:allAlbum";
         //收藏的歌手
         public static final String USER_FAVORITE_ARTIST_PREFIX = "user:favorite:artist:";
+        //签到日期
+        public static final String USER_SIGN_IN_DATE_PREFIX = "user:signIn:date:";
 }

+ 3 - 0
base/src/main/java/com/base/utils/Result.java

@@ -19,6 +19,9 @@ public class Result<T> implements Serializable {
     public static <T> Result<T> success(T data) {
         return new Result<>(200, "success", data);
     }
+    public static <T> Result<T> success() {
+        return new Result<>(200, "success", null);
+    }
     
     // 失败响应
     public static <T> Result<T> fail(String message) {

+ 75 - 24
content/content.sql

@@ -2,29 +2,29 @@
 -- 1. 专辑表(已包含已添加的管理字段)
 -- ------------------------------
 CREATE TABLE `album` (
-    `id` INT AUTO_INCREMENT PRIMARY KEY,
-    `album_name` VARCHAR(100) NOT NULL COMMENT '专辑名称',
-    `artist_id` INT NOT NULL COMMENT '关联artist服务的artist.id',
-    `artist_name` VARCHAR(16) COMMENT '关联artist服务的artist.name',
-    `cover_url` VARCHAR(255) COMMENT '专辑封面URL',
-    `release_time` DATE COMMENT '发行时间',
-    `description` TEXT COMMENT '专辑描述(介绍专辑主题、曲目等)',
-    `album_type` TINYINT DEFAULT 1 COMMENT '专辑类型:1-数字专辑,2-实体专辑,3-EP',
-    `price` DECIMAL(10,2) COMMENT '专辑价格(实体专辑或付费数字专辑使用)',
-    `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                         `id` INT AUTO_INCREMENT PRIMARY KEY,
+                         `album_name` VARCHAR(100) NOT NULL COMMENT '专辑名称',
+                         `artist_id` INT NOT NULL COMMENT '关联artist服务的artist.id',
+                         `artist_name` VARCHAR(16) COMMENT '关联artist服务的artist.name',
+                         `cover_url` VARCHAR(255) COMMENT '专辑封面URL',
+                         `release_time` DATE COMMENT '发行时间',
+                         `description` TEXT COMMENT '专辑描述(介绍专辑主题、曲目等)',
+                         `album_type` TINYINT DEFAULT 1 COMMENT '专辑类型:1-数字专辑,2-实体专辑,3-EP',
+                         `price` DECIMAL(10,2) COMMENT '专辑价格(实体专辑或付费数字专辑使用)',
+                         `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                         `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 -- 已添加的管理字段
-    `status` TINYINT DEFAULT 0 COMMENT '专辑状态:0--审核中,1-审核失败,2-发布中,3-已上架,4-已下架',
-    `audit_reason` VARCHAR(500) COMMENT '审核失败原因',
-    `audit_time` DATETIME COMMENT '审核时间',
-    `publish_time` DATETIME COMMENT '发布时间',
-    `shelf_time` DATETIME COMMENT '上架时间',
-    `off_shelf_time` DATETIME COMMENT '下架时间',
-    `delete_flag` TINYINT DEFAULT 0 COMMENT '删除标志:0-未删除,1-已删除',
-    `delete_time` DATETIME COMMENT '删除时间',
-    INDEX `idx_album_name` (`album_name`),
-    INDEX `idx_artist_id` (`artist_id`),
-    INDEX `idx_status` (`status`)
+                         `status` TINYINT DEFAULT 0 COMMENT '专辑状态:0--审核中,1-审核失败,2-发布中,3-已上架,4-已下架',
+                         `audit_reason` VARCHAR(500) COMMENT '审核失败原因',
+                         `audit_time` DATETIME COMMENT '审核时间',
+                         `publish_time` DATETIME COMMENT '发布时间',
+                         `shelf_time` DATETIME COMMENT '上架时间',
+                         `off_shelf_time` DATETIME COMMENT '下架时间',
+                         `delete_flag` TINYINT DEFAULT 0 COMMENT '删除标志:0-未删除,1-已删除',
+                         `delete_time` DATETIME COMMENT '删除时间',
+                         INDEX `idx_album_name` (`album_name`),
+                         INDEX `idx_artist_id` (`artist_id`),
+                         INDEX `idx_status` (`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='专辑表';
 
 -- ------------------------------
@@ -110,7 +110,7 @@ CREATE TABLE `playlist_song` (
 -- ------------------------------
 CREATE TABLE `lyric` (
                          `id` INT AUTO_INCREMENT PRIMARY KEY,
-                          `lyric_name` VARCHAR(32) NOT NULL COMMENT '歌词名',
+                         `lyric_name` VARCHAR(32) NOT NULL COMMENT '歌词名',
                          `song_id` INT NOT NULL COMMENT '关联本服务的song.id',
                          `lyrics` TEXT NOT NULL COMMENT 'LRC格式歌词文本',
                          `language` VARCHAR(20) DEFAULT 'zh' COMMENT '歌词语言(zh-中文,en-英文等)',
@@ -296,4 +296,55 @@ CREATE TABLE `comment` (
                            INDEX `idx_create_time` (`create_time`), -- 快速按创建时间排序/筛选评论
     -- 复合索引(优化联合查询,比单独索引更高效)
                            INDEX `idx_content_type_id` (`content_type`, `content_id`) -- 便于按内容类型+内容ID批量查询评论
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='评论表(支持歌曲和MV评论)';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='评论表(支持歌曲和MV评论)';
+
+# // 用户等级表
+CREATE TABLE `user_level` (
+                              `id` INT AUTO_INCREMENT PRIMARY KEY,
+                              `user_id` INT NOT NULL COMMENT '用户ID',
+                              `level` INT DEFAULT 1 COMMENT '等级',
+                              `exp` INT DEFAULT 0 COMMENT '经验值',
+                              `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                              UNIQUE KEY `uk_user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户等级表';
+
+# // 用户签到表
+CREATE TABLE `user_sign_in` (
+                                `id` INT AUTO_INCREMENT PRIMARY KEY,
+                                `user_id` INT NOT NULL COMMENT '用户ID',
+                                `sign_date` DATE NOT NULL COMMENT '签到日期',
+                                `experience` INT DEFAULT 0 COMMENT '获得经验',
+                                `continuous_days` TINYINT DEFAULT 1 COMMENT '连续签到天数(首次签到为1,断签后重置为1)',
+                                `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                UNIQUE KEY `uk_user_sign_date` (`user_id`, `sign_date`),
+                                INDEX `idx_user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户签到记录表';
+
+-- 通用播放记录表(支持歌曲、MV)
+CREATE TABLE `play_record` (
+                               `id` INT AUTO_INCREMENT PRIMARY KEY,
+                               `resource_type` TINYINT NOT NULL COMMENT '资源类型:1-歌曲,2-MV',
+                               `resource_id` INT NOT NULL COMMENT '资源ID,歌曲ID或MV ID',
+                               `user_id` INT NOT NULL COMMENT '播放用户ID,关联user表',
+                               `play_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '播放时间',
+    -- 联合索引:优化按类型+资源ID/用户ID/时间的查询
+                               INDEX `idx_resource_type_id` (`resource_type`, `resource_id`),
+                               INDEX `idx_user_id` (`user_id`),
+                               INDEX `idx_play_time` (`play_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='通用播放记录表(歌曲/MV)';
+
+
+-- 最近播放统计表(支持歌曲和MV)
+CREATE TABLE `recent_play_stats` (
+                                     `id` INT AUTO_INCREMENT PRIMARY KEY,
+                                     `user_id` INT NOT NULL COMMENT '播放用户ID,关联user表',
+                                     `content_type` TINYINT NOT NULL COMMENT '资源类型:1-歌曲,2-MV',
+                                     `content_id` INT NOT NULL COMMENT '内容ID(歌曲ID或MV ID)',
+                                     `first_play_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '首次播放时间',
+                                     `last_play_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后播放时间',
+                                     UNIQUE KEY `uk_user_content_type_id` (`user_id`, `content_type`, `content_id`),
+                                     INDEX `idx_user_id` (`user_id`),
+                                     INDEX `idx_content_type` (`content_type`),
+                                     INDEX `idx_content_id` (`content_id`),
+                                     INDEX `idx_last_play_time` (`last_play_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='最近播放统计表(歌曲和MV通用)';

+ 4 - 1
content/pom.xml

@@ -78,7 +78,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>

+ 1 - 1
content/src/main/java/com/content/controller/CommentController.java

@@ -66,7 +66,7 @@ public class CommentController {
     public Result getCommentList(@RequestBody getCommentListDto getCommentListDto) {
         List<Comment> list = commentService.lambdaQuery()
                 .eq(Comment::getContentId, getCommentListDto.getContentId())
-                .eq(Comment::getContentType, getCommentListDto.getType()).isNull(Comment::getParentId).eq(Comment::getStatus, 1).list();
+                .eq(Comment::getContentType, getCommentListDto.getType()).isNull(Comment::getParentId).eq(Comment::getStatus, 1).orderByDesc(Comment::getCreateTime).list();
         return Result.success(list);
     }
     @GetMapping("/listByPid")

+ 0 - 25
content/src/main/java/com/content/domain/query/PageQuery.java

@@ -1,25 +0,0 @@
-package com.content.domain.query;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(description = "分页查询实体")
-public class PageQuery {
-    @ApiModelProperty("页码")
-    private Long pageNo;
-    @ApiModelProperty("页码")
-    private Long pageSize;
-    @ApiModelProperty("查询字段")
-    private String tag;
-    @ApiModelProperty("查询语种")
-    private String language;
-    @ApiModelProperty("查询风格")
-    private String style;
-    @ApiModelProperty("查询场景")
-    private String scene;
-    @ApiModelProperty("查询情感")
-    private String emotion;
-    @ApiModelProperty("查询主题")
-    private String theme;
-}

+ 2 - 0
content/src/main/java/com/content/service/ISongService.java

@@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISongService extends IService<Song> {
 
     void updateApplyAndLyrics(ApplyDto applyDto);
+
+
 }

+ 2 - 0
content/src/main/java/com/content/service/impl/SongServiceImpl.java

@@ -30,4 +30,6 @@ public class SongServiceImpl extends ServiceImpl<SongMapper, Song> implements IS
         this.lambdaUpdate().eq(Song::getId, applyDto.getId()).set(Song::getStatus, applyDto.getStatus()).set(Song::getAuditReason, applyDto.getValue()).update();
         iLyricService.lambdaUpdate().eq(Lyric::getSongId, applyDto.getId()).set(Lyric::getStatus, applyDto.getStatus()).update();
     }
+
+
 }

+ 2 - 1
media/src/main/java/com/media/util/enums/StorageBucket.java

@@ -11,7 +11,8 @@ public enum StorageBucket {
     COMMENT_IMAGES("comment-images"),//    COMMENT_IMAGES: 评论图片存储桶
     SONG_AUDIO("song-audio"),//    SONG_AUDIO: 歌曲音频存储桶
     PLAYLIST_COVERS("playlist-covers"),//    PLAYLIST_COVERS: 歌单封面存储桶
-    Video_Temp("video-temp");
+    COMMENT_FILES("comment-files"),    //评论文件储存
+    Video_Temp("video-temp");//合并文件存储桶
     private final String bucketName;
     
     StorageBucket(String bucketName) {