Merge branch 'master' of https://gitee.com/menxipeng/musicpro

ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/CategoryInfoController.java

@@ -4,11 +4,13 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.CategoryInfo;
+import com.ruoyi.common.core.domain.entity.MusicInfo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.config.AliConfig;
 import com.ruoyi.system.service.ICategoryInfoService;
+import com.ruoyi.system.service.IMusicInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -30,7 +32,8 @@ public class CategoryInfoController extends BaseController
 {
     @Autowired
     private ICategoryInfoService categoryInfoService;
-
+    @Autowired
+    private IMusicInfoService musicInfoService;
     /**
      * 查询【请填写功能名称】列表
      */
@@ -43,6 +46,15 @@ public class CategoryInfoController extends BaseController
         return getDataTable(list);
     }
 
+
+    // 根据分类获取分类音乐
+    @GetMapping("/cate/music/{categoryId}")
+    public TableDataInfo getCategoryMusic(@PathVariable String categoryId){
+        startPage();
+        List<MusicInfo> list = musicInfoService.selectMusicInfoByCid(categoryId);
+        return getDataTable(list);
+    }
+
     /**
      * 导出【请填写功能名称】列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicInfoController.java

@@ -4,9 +4,14 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.MusicInfo;
+import com.ruoyi.common.core.domain.entity.MusicScene;
+import com.ruoyi.common.core.domain.entity.MusicSceneRelate;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.MusicType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.mapper.MusicSceneMapper;
+import com.ruoyi.system.mapper.MusicSceneRelateMapper;
 import com.ruoyi.system.service.IMusicInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 音乐信息Controller
@@ -27,6 +33,10 @@ public class MusicInfoController extends BaseController
 {
     @Autowired
     private IMusicInfoService musicInfoService;
+    @Autowired
+    private MusicSceneRelateMapper relateMapper;
+    @Autowired
+    private MusicSceneMapper musicSceneMapper;
 
     /**
      * 查询音乐信息列表
@@ -37,6 +47,22 @@ public class MusicInfoController extends BaseController
     {
         startPage();
         List<MusicInfo> list = musicInfoService.selectMusicInfoList(musicInfo);
+        // 如果是混音查询混音的信息
+        if (musicInfo.getMusicType() != null && musicInfo.getMusicType().equals(MusicType.MIXING.getMusicType())){
+            for (MusicInfo info : list) {
+                // 查询混音相关信息
+                MusicSceneRelate relateInfo = relateMapper.selectByMusicId(String.valueOf(info.getMusicId()));
+                if (relateInfo != null) {
+                    String sceneIds = relateInfo.getSceneIds();
+                    String[] sceneArray = sceneIds.split(",");
+                    List<MusicScene> musicScenes = musicSceneMapper.selectMusicSceneBySceneIds(sceneArray);
+                    relateInfo.setMusicScenes(musicScenes);
+                    info.setMusicScene(relateInfo);
+                }
+            }
+            //list = musicInfoService.findMusicByCate(musicInfo);
+        }
+
         return getDataTable(list);
     }
 
@@ -123,4 +149,13 @@ public class MusicInfoController extends BaseController
     public AjaxResult add(@RequestBody MusicInfo musicInfo) {
         return toAjax(musicInfoService.insertMusicInfo(musicInfo));
     }
+
+    @RequestMapping("/add/mixMusic")
+    public AjaxResult addMixMusicInfo(@RequestBody Map<String,String> param){
+        MusicInfo newMusic = musicInfoService.addMixMusicInfo(param);
+        if (newMusic != null){
+            return AjaxResult.success(newMusic);
+        }
+        return AjaxResult.error("混音错误");
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicRecommendController.java

@@ -29,7 +29,7 @@ public class MusicRecommendController extends BaseController
     private IMusicRecommendService musicRecommendService;
 
     /**
-     * 查询【请填写功能名称】列表
+     * 查询【请填写功能/back/re名称】列表
      */
     @PreAuthorize("@ss.hasPermi('system:recommend:list')")
     @GetMapping("/list")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/RecommendInfoController.java

@@ -31,7 +31,7 @@ public class RecommendInfoController extends BaseController
     /**
      * 查询推荐列表
      */
-    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    //@PreAuthorize("@ss.hasPermi('system:info:list')")
     @GetMapping("/list")
     public TableDataInfo list(RecommendInfo recommendInfo)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/TagController.java

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.back;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.Tag;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ITagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/back/tag")
+public class TagController extends BaseController
+{
+    @Autowired
+    private ITagService tagService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:tag:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Tag tag)
+    {
+        startPage();
+        List<Tag> list = tagService.selectTagList(tag);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Tag tag)
+    {
+        List<Tag> list = tagService.selectTagList(tag);
+        ExcelUtil<Tag> util = new ExcelUtil<Tag>(Tag.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tagService.selectTagById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Tag tag)
+    {
+        return toAjax(tagService.insertTag(tag));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Tag tag)
+    {
+        return toAjax(tagService.updateTag(tag));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tagService.deleteTagByIds(ids));
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Tag.java

@@ -0,0 +1,53 @@
+package com.ruoyi.common.core.domain.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 tag
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+public class Tag extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private String id;
+
+    /** 标签名称 */
+    @Excel(name = "标签名称")
+    private String name;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -1,8 +1,11 @@
 package com.ruoyi.framework.config;
 
-import java.util.concurrent.TimeUnit;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.CacheControl;
@@ -12,9 +15,8 @@ import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.ruoyi.common.config.RuoYiConfig;
+
-import com.ruoyi.common.constant.Constants;
+import java.util.concurrent.TimeUnit;
-import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
 
 /**
  * 通用配置
@@ -73,4 +75,17 @@ public class ResourcesConfig implements WebMvcConfigurer
         // 返回新的CorsFilter
         return new CorsFilter(source);
     }
+
+    /**
+     * Jackson全局转化long类型为String，解决jackson序列化时long类型缺失精度问题
+     * @return Jackson2ObjectMapperBuilderCustomizer 注入的对象
+     */
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() {
+        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder
+                .serializerByType(Long.class, ToStringSerializer.instance)
+                .serializerByType(Long.TYPE, ToStringSerializer.instance);
+    }
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TagMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.common.core.domain.entity.Tag;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+public interface TagMapper 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public Tag selectTagById(String id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<Tag> selectTagList(Tag tag);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertTag(Tag tag);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateTag(Tag tag);
+
+    /**
+     * 删除【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteTagById(String id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTagByIds(String[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ITagService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.entity.Tag;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+public interface ITagService 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public Tag selectTagById(String id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<Tag> selectTagList(Tag tag);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertTag(Tag tag);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateTag(Tag tag);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    public int deleteTagByIds(String[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteTagById(String id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicInfoServiceImpl.java

@@ -203,7 +203,9 @@ public class MusicInfoServiceImpl implements IMusicInfoService
 
     @Override
     public MusicInfo addMixMusicInfo(Map<String, String> param) {
-        Long userId = SecurityUtils.getUserId();
+        //TODO:
+       // Long userId = SecurityUtils.getUserId();
+        Long userId = 10000L;
         String musicId = param.get("musicId");
         String sceneIds = param.get("sceneIds");
         String sceneJson = param.get("sceneJson");
@@ -220,6 +222,7 @@ public class MusicInfoServiceImpl implements IMusicInfoService
             musicSceneRelate.setUserId(userId);
             musicSceneRelate.setSceneInfo(sceneJson);
             musicSceneRelate.setSourceMusicId(musicId);
+            relateMapper.insertMusicSceneRelate(musicSceneRelate);
             return musicInfo;
         }
         return null;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TagServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.entity.Tag;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.mapper.TagMapper;
+import com.ruoyi.system.service.ITagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@Service
+public class TagServiceImpl implements ITagService 
+{
+    @Autowired
+    private TagMapper tagMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public Tag selectTagById(String id)
+    {
+        return tagMapper.selectTagById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<Tag> selectTagList(Tag tag)
+    {
+        return tagMapper.selectTagList(tag);
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertTag(Tag tag)
+    {
+        tag.setCreateTime(DateUtils.getNowDate());
+        return tagMapper.insertTag(tag);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param tag 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateTag(Tag tag)
+    {
+        return tagMapper.updateTag(tag);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTagByIds(String[] ids)
+    {
+        return tagMapper.deleteTagByIds(ids);
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTagById(String id)
+    {
+        return tagMapper.deleteTagById(id);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/MusicSceneRelateMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INSERT INTO music_scene_relate(music_id, scene_ids, user_id, scene_info,source_music_id) VALUE (#{musicId},#{sceneIds},#{userId},#{sceneInfo},#{sourceMusicId})
     </insert>
 
-    <select id="selectByMusicId" resultType="com.ruoyi.common.core.domain.entity.MusicSceneRelate">
+    <select id="selectByMusicId" resultMap="MusicSceneRelateResult">
-
+        select * from music_scene_relate where music_id = #{musicId}
     </select>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/TagMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TagMapper">
+    
+    <resultMap type="Tag" id="TagResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTagVo">
+        select id, name, create_time from tag
+    </sql>
+
+    <select id="selectTagList" parameterType="Tag" resultMap="TagResult">
+        <include refid="selectTagVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectTagById" parameterType="String" resultMap="TagResult">
+        <include refid="selectTagVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTag" parameterType="Tag" useGeneratedKeys="true" keyProperty="id">
+        insert into tag
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTag" parameterType="Tag">
+        update tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTagById" parameterType="String">
+        delete from tag where id = #{id}
+    </delete>
+
+    <delete id="deleteTagByIds" parameterType="String">
+        delete from tag where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-ui/src/api/playlist/normal.js

@@ -12,7 +12,10 @@ export function listNormalSong(query) {
 // 查询普通歌曲详细
 export function getNormalSong(id) {
   return request({
-    url: '/back/normal/' + id,
+    url: '/back/music/list/',
+    params: {
+      musicId: id
+    },
     method: 'get'
   })
 }
@@ -20,7 +23,7 @@ export function getNormalSong(id) {
 // 新增普通歌曲
 export function addNormalSong(data) {
   return request({
-    url: '/back/normal/add',
+    url: '/back/music/addMusic',
     method: 'post',
     data: data
   })
@@ -29,8 +32,8 @@ export function addNormalSong(data) {
 // 修改普通歌曲
 export function updateNormalSong(data) {
   return request({
-    url: '/back/normal/update',
+    url: '/back/music/',
-    method: 'post',
+    method: 'put',
     data: data
   })
 }
@@ -38,7 +41,7 @@ export function updateNormalSong(data) {
 // 删除普通歌曲
 export function delNormalSong(id) {
   return request({
-    url: '/back/normal/' + id,
+    url: '/back/music/' + id,
     method: 'delete'
   })
 }

ruoyi-ui/src/api/playlist/remix.js

@@ -36,7 +36,7 @@ export function addRemixSong(data) {
   formData.append('status', data.status)
   formData.append('selectedSongs', JSON.stringify(data.selectedSongs))
   return request({
-    url: '/back/remix/add',
+    url: '/back/music/add/mixMusic',
     method: 'post',
     data: formData,
     headers: {
@@ -69,7 +69,7 @@ export function updateRemixSong(data) {
 // 删除混音歌曲
 export function delRemixSong(id) {
   return request({
-    url: '/back/remix/' + id,
+    url: '/back/music/' + id,
     method: 'delete'
   })
 }

ruoyi-ui/src/api/playlist/tag.js

@@ -0,0 +1,9 @@
+import request from "@/utils/request";
+
+export function listTags(query) {
+  return request({
+    url: '/back/tag/list',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/views/playlist/normal/index.vue

@@ -154,7 +154,20 @@
           </el-select>
         </el-form-item>
         <el-form-item label="标签" prop="label">
-          <el-input v-model="form.label" placeholder="请输入标签，多个标签用分号分隔" />
+          <el-select
+            v-model="selectedTags"
+            multiple
+            filterable
+            placeholder="请选择标签"
+            style="width: 100%"
+            @change="handleTagsChange">
+            <el-option
+              v-for="item in tagOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="音乐图片" prop="imgAddr">
           <image-upload
@@ -183,6 +196,7 @@
 
 <script>
 import { listNormalSong, getNormalSong, delNormalSong, addNormalSong, updateNormalSong } from "@/api/playlist/normal";
+import { listTags } from "@/api/playlist/tag";
 
 export default {
   name: "Normal",
@@ -194,6 +208,8 @@ export default {
       playlistList: [],
       title: "",
       open: false,
+      tagOptions: [], // 标签选项列表
+      selectedTags: [], // 已选择的标签
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -219,6 +235,9 @@ export default {
         ],
         musicType: [
           { required: true, message: "音乐类型不能为空", trigger: "change" }
+        ],
+        imgAddr: [
+          { required: true, message: "音乐图片不能为空", trigger: "change" }
         ]
       }
     };
@@ -236,6 +255,39 @@ export default {
         this.loading = false;
       });
     },
+    // 获取标签列表
+    getTagList() {
+      listTags().then(response => {
+        this.tagOptions = response.rows || [];
+        // 如果正在编辑，解析已有的标签
+        if (this.form.label) {
+          this.parseTagsFromString(this.form.label);
+        }
+      });
+    },
+    // 处理标签选择变化
+    handleTagsChange(value) {
+      // 将标签ID数组转换为标签名称数组
+      const selectedTagNames = value.map(id => {
+        const tag = this.tagOptions.find(item => item.id === id);
+        return tag ? tag.name : '';
+      }).filter(name => name !== '');
+
+      // 用分号连接并更新表单
+      this.form.label = selectedTagNames.join(';');
+    },
+    // 从字符串解析标签
+    parseTagsFromString(tagString) {
+      if (!tagString) {
+        this.selectedTags = [];
+        return;
+      }
+
+      const tagNames = tagString.split(';');
+      this.selectedTags = this.tagOptions
+        .filter(tag => tagNames.includes(tag.name))
+        .map(tag => tag.id);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -255,6 +307,7 @@ export default {
         musicType: "ordinary",
         label: null
       };
+      this.selectedTags = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -270,15 +323,21 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getTagList(); // 获取标签列表
       this.open = true;
       this.title = "添加普通歌曲";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.musicId || this.ids;
+      this.getTagList(); // 获取标签列表
       getNormalSong(id).then(response => {
         this.form = response.data;
+        // 解析已有的标签
+        if (this.form.label && this.tagOptions.length > 0) {
+          this.parseTagsFromString(this.form.label);
+        }
         this.open = true;
         this.title = "修改普通歌曲";
       });
@@ -287,6 +346,12 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          // 检查音乐图片是否已上传
+          if (!this.form.imgAddr) {
+            this.$message.error("请上传音乐图片");
+            return;
+          }
+
           if (this.form.id != null) {
             updateNormalSong(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

ruoyi-ui/src/views/playlist/remix/index.vue

@@ -59,40 +59,49 @@
 
     <el-table v-loading="loading" :data="playlistList">
       <el-table-column label="序号" align="center" type="index" width="60" />
-      <el-table-column label="混音名称" align="center" prop="remixName" :show-overflow-tooltip="true" />
+      <el-table-column label="混音名称" align="center" prop="name" :show-overflow-tooltip="true" />
-      <el-table-column label="二类音乐名称" align="center" prop="secondMusicName" :show-overflow-tooltip="true" />
+<!--      <el-table-column label="作者" align="center" prop="author" :show-overflow-tooltip="true" />-->
-      <el-table-column label="制作时间" align="center" prop="productionTime" width="120" />
+      <el-table-column label="音乐场景" align="center" prop="musicScene" width="200">
-      <el-table-column label="文件类型" align="center" prop="fileType" width="120" />
-      <el-table-column label="权限" align="center" prop="permission" width="80">
-        <template slot-scope="scope">
-          <span>{{ scope.row.permission === 1 ? 'VIP' : '免费' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="分类" align="center" prop="category" width="100">
-        <template slot-scope="scope">
-          <el-tag type="primary" size="mini">{{ scope.row.category }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="标签" align="center" prop="tags" width="150">
         <template slot-scope="scope">
           <el-tag
-            v-for="tag in scope.row.tags" 
+            v-for="scene in getScenes(scope.row)"
-            :key="tag" 
+            :key="scene.sceneId"
-            type="warning" 
+            type="primary"
             size="mini"
-            style="margin-right: 5px;"
+            style="margin-right: 5px; margin-bottom: 5px;"
+          >
+            {{ scene.scene }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="VIP权限" align="center" prop="vip" width="80">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.vip === '1' ? 'warning' : 'success'" size="mini">
+            {{ scope.row.vip === '1' ? 'VIP' : '免费' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="标签" align="center" prop="label" width="150">
+        <template slot-scope="scope">
+          <el-tag
+            v-for="tag in scope.row.label ? scope.row.label.split(';') : []"
+            :key="tag"
+            type="info"
+            size="mini"
+            style="margin-right: 5px; margin-bottom: 5px;"
           >
             {{ tag }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="80">
+      <el-table-column label="上架状态" align="center" prop="shelf" width="80">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'" size="mini">
+          <el-tag :type="scope.row.shelf === '1' ? 'success' : 'danger'" size="mini">
-            {{ scope.row.status === 1 ? '上架' : '下架' }}
+            {{ scope.row.shelf === '1' ? '上架' : '下架' }}
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="120" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
           <el-button
@@ -124,105 +133,85 @@
     <!-- 添加或修改混音歌曲对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="混音名称" prop="remixName" required>
+        <el-form-item label="音乐名称" prop="name" required>
-          <el-input v-model="form.remixName" placeholder="请输入音乐名称" />
+          <el-input v-model="form.name" placeholder="请输入音乐名称" />
         </el-form-item>
-        <el-form-item label="权限" prop="permission" required>
+        <el-form-item label="作者" prop="author" required>
-          <el-select v-model="form.permission" placeholder="请选择权限" style="width: 100%">
+          <el-input v-model="form.author" placeholder="请输入作者" />
+        </el-form-item>
+        <el-form-item label="VIP权限" prop="vip" required>
+          <el-select v-model="form.vip" placeholder="请选择VIP权限" style="width: 100%">
             <el-option label="免费" :value="0" />
             <el-option label="VIP" :value="1" />
           </el-select>
         </el-form-item>
-        <el-form-item label="分类配置" prop="categoryConfig" required>
+        <el-form-item label="上架状态" prop="shelf" required>
-          <el-select v-model="form.categoryConfig" placeholder="请选择分类" style="width: 100%">
+          <el-select v-model="form.shelf" placeholder="请选择上架状态" style="width: 100%">
-            <el-option
+            <el-option label="上架" :value="1" />
-              v-for="item in categoryOptions"
+            <el-option label="下架" :value="2" />
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
-        <el-form-item label="标签" prop="tags">
+        <el-form-item label="标签" prop="label">
-          <el-select v-model="form.tags" multiple placeholder="请添加标签 (可多选)" style="width: 100%">
+          <el-select
+            v-model="selectedTags"
+            multiple
+            filterable
+            placeholder="请选择标签"
+            style="width: 100%"
+            @change="handleTagsChange">
             <el-option
               v-for="item in tagOptions"
-              :key="item.value"
+              :key="item.id"
-              :label="item.label"
+              :label="item.name"
-              :value="item.value"
+              :value="item.id">
-            />
+            </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="分类" prop="category" required>
+        <el-form-item label="音乐场景" prop="musicScenes" required>
-          <el-select v-model="form.category" placeholder="请选择分类" style="width: 100%">
-            <el-option
-              v-for="item in categoryOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="上架状态" prop="status" required>
-          <el-switch v-model="form.status" active-value="1" inactive-value="0" />
-        </el-form-item>
-        <el-form-item label="添加场景音乐" required>
           <div class="scene-music-container">
             <div
-              v-for="(item, index) in 3" 
+              v-for="(scene, index) in availableScenes"
-              :key="index"
+              :key="scene.sceneId"
               class="scene-music-item"
-              @click="selectSceneMusic(index)"
             >
-              <div v-if="form.selectedSongs[index]" class="selected-music">
+              <el-checkbox
-                <img :src="form.selectedSongs[index].coverUrl" class="music-cover">
+                v-model="selectedScenes"
-                <span class="music-name">{{ form.selectedSongs[index].musicName }}</span>
+                :label="scene.sceneId"
-                <i class="el-icon-close remove-btn" @click.stop="removeSceneMusic(index)"></i>
+                @change="handleSceneChange"
-              </div>
+              >
-              <div v-else class="add-music-btn">
+                {{ scene.scene }}
-                <i class="el-icon-plus"></i>
+              </el-checkbox>
-              </div>
             </div>
           </div>
         </el-form-item>
+        <el-form-item label="音乐图片" prop="imgAddr">
+          <image-upload
+            v-model="form.imgAddr"
+            :limit="1"
+            :file-type="['jpg', 'jpeg', 'png', 'gif']"
+            action="/back/upload/musicImg/file"
+          />
+        </el-form-item>
+        <el-form-item label="音乐文件" prop="musicAddr">
+          <file-upload
+            v-model="form.musicAddr"
+            :limit="1"
+            :file-type="['mp3', 'wav', 'flac']"
+            action="/back/upload/music/file"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 选择场景音乐对话框 -->
-    <el-dialog title="选择场景音乐" :visible.sync="musicSelectOpen" width="800px" append-to-body>
-      <el-table :data="musicList" @selection-change="handleMusicSelectionChange">
-        <el-table-column type="selection" width="55" />
-        <el-table-column label="音乐名称" prop="musicName" />
-        <el-table-column label="制作人" prop="producer" />
-        <el-table-column label="分类" prop="category" />
-        <el-table-column label="标签" prop="tags">
-          <template slot-scope="scope">
-            <el-tag 
-              v-for="tag in scope.row.tags" 
-              :key="tag" 
-              type="warning" 
-              size="mini" 
-              style="margin-right: 5px;"
-            >
-              {{ tag }}
-            </el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="confirmMusicSelection">确 定</el-button>
-        <el-button @click="musicSelectOpen = false">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listRemixSong, getRemixSong, delRemixSong, addRemixSong, updateRemixSong, getMusicList } from "@/api/playlist/remix";
+import { listTags } from "@/api/playlist/tag";
 
 export default {
   name: "RemixSong",
@@ -234,27 +223,27 @@ export default {
       playlistList: [],
       title: "",
       open: false,
-      musicSelectOpen: false,
+      selectedTags: [], // 已选择的标签
-      currentMusicIndex: 0,
+      selectedScenes: [], // 已选择的场景
+      availableScenes: [], // 可用的场景列表
       musicList: [],
-      selectedMusic: null,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         musicName: null,
         category: null,
         tag: null,
-        status: null,
+        shelf: null,
-        permission: null
+        vip: null,
-      },
+        musicType: 'mixing'
-      form: {
-        selectedSongs: []
       },
+      form: {},
       rules: {
-        remixName: [{ required: true, message: "混音名称不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "音乐名称不能为空", trigger: "blur" }],
-        permission: [{ required: true, message: "权限不能为空", trigger: "change" }],
+        author: [{ required: true, message: "作者不能为空", trigger: "blur" }],
-        categoryConfig: [{ required: true, message: "分类配置不能为空", trigger: "change" }],
+        vip: [{ required: true, message: "VIP权限不能为空", trigger: "change" }],
-        category: [{ required: true, message: "分类不能为空", trigger: "change" }]
+        shelf: [{ required: true, message: "上架状态不能为空", trigger: "change" }],
+        imgAddr: [{ required: true, message: "音乐图片不能为空", trigger: "change" }]
       },
       categoryOptions: [
         { label: '热门', value: '热门' },
@@ -263,17 +252,7 @@ export default {
         { label: '古典', value: '古典' },
         { label: '爵士', value: '爵士' }
       ],
-      tagOptions: [
+      tagOptions: [],
-        { label: '流行', value: '流行' },
-        { label: '摇滚', value: '摇滚' },
-        { label: '古典', value: '古典' },
-        { label: '爵士', value: '爵士' },
-        { label: '电子', value: '电子' },
-        { label: '民谣', value: '民谣' },
-        { label: '电音', value: '电音' },
-        { label: '混音', value: '混音' },
-        { label: '睡眠', value: '睡眠' }
-      ],
       statusOptions: [
         { label: '下架', value: 0 },
         { label: '上架', value: 1 }
@@ -302,6 +281,75 @@ export default {
         this.musicList = response.rows || [];
       });
     },
+    // 获取音乐场景数据
+    getScenes(row) {
+      if (row.musicScene && row.musicScene.musicScenes && row.musicScene.musicScenes.length > 0) {
+        return row.musicScene.musicScenes;
+      }
+      return [];
+    },
+    // 获取场景列表
+    getSceneList() {
+      // 这里应该调用获取场景列表的API，这里模拟一些数据
+      this.availableScenes = [
+        { sceneId: '1', scene: '下雨' },
+        { sceneId: '2', scene: '打雷' },
+        { sceneId: '3', scene: '海浪' },
+        { sceneId: '4', scene: '森林' }
+      ];
+    },
+    // 获取标签列表
+    getTagList() {
+      listTags().then(response => {
+        this.tagOptions = response.rows || [];
+        // 如果正在编辑，解析已有的标签
+        if (this.form.label) {
+          this.parseTagsFromString(this.form.label);
+        }
+      });
+    },
+    // 处理标签选择变化
+    handleTagsChange(value) {
+      // 将标签ID数组转换为标签名称数组
+      const selectedTagNames = value.map(id => {
+        const tag = this.tagOptions.find(item => item.id === id);
+        return tag ? tag.name : '';
+      }).filter(name => name !== '');
+
+      // 用分号连接并更新表单
+      this.form.label = selectedTagNames.join(';');
+    },
+    // 从字符串解析标签
+    parseTagsFromString(tagString) {
+      if (!tagString) {
+        this.selectedTags = [];
+        return;
+      }
+
+      const tagNames = tagString.split(';');
+      this.selectedTags = this.tagOptions
+        .filter(tag => tagNames.includes(tag.name))
+        .map(tag => tag.id);
+    },
+    // 处理场景选择变化
+    handleSceneChange() {
+      if (this.form.musicScene) {
+        this.form.musicScene.sceneIds = this.selectedScenes.join(',');
+      } else {
+        this.form.musicScene = {
+          sceneIds: this.selectedScenes.join(',')
+        };
+      }
+    },
+    // 从字符串解析场景
+    parseSceneIdsFromString(sceneIdsString) {
+      if (!sceneIdsString) {
+        this.selectedScenes = [];
+        return;
+      }
+
+      this.selectedScenes = sceneIdsString.split(',');
+    },
     cancel() {
       this.open = false;
       this.reset();
@@ -309,14 +357,21 @@ export default {
     reset() {
       this.form = {
         id: null,
-        remixName: null,
+        musicId: null,
-        permission: 0,
+        name: null,
-        categoryConfig: null,
+        author: null,
-        category: null,
+        vip: 0,
-        tags: [],
+        shelf: 1,
-        status: 1,
+        imgAddr: null,
-        selectedSongs: []
+        musicAddr: null,
+        musicType: "mixing",
+        label: null,
+        musicScene: {
+          sceneIds: ""
+        }
       };
+      this.selectedTags = [];
+      this.selectedScenes = [];
       this.resetForm("form");
     },
     handleQuery() {
@@ -329,14 +384,29 @@ export default {
     },
     handleAdd() {
       this.reset();
+      this.getTagList(); // 获取标签列表
+      this.getSceneList(); // 获取场景列表
       this.open = true;
       this.title = "新增混音歌曲";
     },
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      this.getTagList(); // 获取标签列表
+      this.getSceneList(); // 获取场景列表
+      const id = row.id || this.ids;
       getRemixSong(id).then(response => {
         this.form = response.data;
+
+        // 解析已有的标签
+        if (this.form.label && this.tagOptions.length > 0) {
+          this.parseTagsFromString(this.form.label);
+        }
+
+        // 解析已有的场景
+        if (this.form.musicScene && this.form.musicScene.sceneIds) {
+          this.parseSceneIdsFromString(this.form.musicScene.sceneIds);
+        }
+
         this.open = true;
         this.title = "编辑混音歌曲";
       });
@@ -368,25 +438,6 @@ export default {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
-    },
-    selectSceneMusic(index) {
-      this.currentMusicIndex = index;
-      this.musicSelectOpen = true;
-    },
-    handleMusicSelectionChange(selection) {
-      if (selection.length > 0) {
-        this.selectedMusic = selection[0];
-      }
-    },
-    confirmMusicSelection() {
-      if (this.selectedMusic) {
-        this.$set(this.form.selectedSongs, this.currentMusicIndex, this.selectedMusic);
-        this.musicSelectOpen = false;
-        this.selectedMusic = null;
-      }
-    },
-    removeSceneMusic(index) {
-      this.$delete(this.form.selectedSongs, index);
     }
   }
 };
@@ -395,58 +446,24 @@ export default {
 <style scoped>
 .scene-music-container {
   display: flex;
+  flex-wrap: wrap;
   gap: 10px;
 }
 .scene-music-item {
-  width: 120px;
+  min-width: 120px;
-  height: 120px;
+  padding: 10px;
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
   cursor: pointer;
   display: flex;
   align-items: center;
   justify-content: center;
-  position: relative;
 }
 .scene-music-item:hover {
   border-color: #409EFF;
 }
-.add-music-btn {
-  font-size: 28px;
-  color: #8c939d;
-}
-.selected-music {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-}
-.music-cover {
-  width: 60px;
-  height: 60px;
-  border-radius: 4px;
-  margin-bottom: 5px;
-}
-.music-name {
-  font-size: 12px;
-  color: #606266;
-  text-align: center;
-  max-width: 100px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.remove-btn {
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  color: #f56c6c;
-  cursor: pointer;
-}
 .el-tag {
   border-radius: 12px;
+  margin-bottom: 5px;
 }
 </style>