From 0c82bef9332dde047bfa891073c39087630eb56c Mon Sep 17 00:00:00 2001 From: menxipeng Date: Fri, 1 Aug 2025 16:06:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84c=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/CategoryInfoController.java | 14 ++- .../back/MusicRecommendController.java | 2 +- .../back/RecommendInfoController.java | 2 +- .../web/controller/back/TagController.java | 98 +++++++++++++++++++ .../ruoyi/common/core/domain/entity/Tag.java | 53 ++++++++++ .../framework/config/ResourcesConfig.java | 25 ++++- .../com/ruoyi/system/mapper/TagMapper.java | 62 ++++++++++++ .../com/ruoyi/system/service/ITagService.java | 62 ++++++++++++ .../system/service/impl/TagServiceImpl.java | 96 ++++++++++++++++++ .../resources/mapper/system/TagMapper.xml | 60 ++++++++++++ 10 files changed, 466 insertions(+), 8 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/TagController.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Tag.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TagMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ITagService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TagServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/TagMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/CategoryInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/CategoryInfoController.java index 5dd3a95..4cd4530 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/CategoryInfoController.java +++ b/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 list = musicInfoService.selectMusicInfoByCid(categoryId); + return getDataTable(list); + } + /** * 导出【请填写功能名称】列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicRecommendController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicRecommendController.java index b1eaf65..0bdbd9c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicRecommendController.java +++ b/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") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/RecommendInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/RecommendInfoController.java index 4034256..70a30c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/RecommendInfoController.java +++ b/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) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/TagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/TagController.java new file mode 100644 index 0000000..3a59771 --- /dev/null +++ b/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 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 list = tagService.selectTagList(tag); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Tag.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Tag.java new file mode 100644 index 0000000..6d893c0 --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java index 35954f4..5e0a6bb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/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 com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; + +import java.util.concurrent.TimeUnit; /** * 通用配置 @@ -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); + } + + } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TagMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TagMapper.java new file mode 100644 index 0000000..cb7982b --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITagService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITagService.java new file mode 100644 index 0000000..807d49e --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TagServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TagServiceImpl.java new file mode 100644 index 0000000..021e82c --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/TagMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TagMapper.xml new file mode 100644 index 0000000..52971df --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/TagMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + select id, name, create_time from tag + + + + + + + + insert into tag + + name, + create_time, + + + #{name}, + #{createTime}, + + + + + update tag + + name = #{name}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from tag where id = #{id} + + + + delete from tag where id in + + #{id} + + + \ No newline at end of file From 75069d565344923383d62bf65b5dae21d6912fde Mon Sep 17 00:00:00 2001 From: menxipeng Date: Fri, 1 Aug 2025 17:35:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?p=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/back/MusicInfoController.java | 37 +- .../service/impl/MusicInfoServiceImpl.java | 21 +- .../mapper/system/MusicSceneRelateMapper.xml | 8 +- ruoyi-ui/src/api/playlist/normal.js | 13 +- ruoyi-ui/src/api/playlist/remix.js | 4 +- ruoyi-ui/src/views/playlist/normal/index.vue | 85 +++- ruoyi-ui/src/views/playlist/remix/index.vue | 373 +++++++++--------- ruoyi-ui/vue.config.js | 2 +- 8 files changed, 333 insertions(+), 210 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicInfoController.java index c4056c3..1acc24b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicInfoController.java +++ b/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,10 +19,11 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * 音乐信息Controller - * + * * @author ruoyi * @date 2025-07-15 */ @@ -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 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 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 param){ + MusicInfo newMusic = musicInfoService.addMixMusicInfo(param); + if (newMusic != null){ + return AjaxResult.success(newMusic); + } + return AjaxResult.error("混音错误"); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicInfoServiceImpl.java index 2f08754..ff25a39 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicInfoServiceImpl.java @@ -21,12 +21,12 @@ import java.util.Map; /** * 音乐信息Service业务层处理 - * + * * @author ruoyi * @date 2025-07-15 */ @Service -public class MusicInfoServiceImpl implements IMusicInfoService +public class MusicInfoServiceImpl implements IMusicInfoService { @Autowired private MusicInfoMapper musicInfoMapper; @@ -45,7 +45,7 @@ public class MusicInfoServiceImpl implements IMusicInfoService /** * 查询音乐信息 - * + * * @param id 音乐信息主键 * @return 音乐信息 */ @@ -57,7 +57,7 @@ public class MusicInfoServiceImpl implements IMusicInfoService /** * 查询音乐信息列表 - * + * * @param musicInfo 音乐信息 * @return 音乐信息 */ @@ -69,7 +69,7 @@ public class MusicInfoServiceImpl implements IMusicInfoService /** * 新增音乐信息 - * + * * @param musicInfo 音乐信息 * @return 结果 */ @@ -87,7 +87,7 @@ public class MusicInfoServiceImpl implements IMusicInfoService /** * 修改音乐信息 - * + * * @param musicInfo 音乐信息 * @return 结果 */ @@ -100,7 +100,7 @@ public class MusicInfoServiceImpl implements IMusicInfoService /** * 批量删除音乐信息 - * + * * @param ids 需要删除的音乐信息主键 * @return 结果 */ @@ -112,7 +112,7 @@ public class MusicInfoServiceImpl implements IMusicInfoService /** * 删除音乐信息信息 - * + * * @param id 音乐信息主键 * @return 结果 */ @@ -203,7 +203,9 @@ public class MusicInfoServiceImpl implements IMusicInfoService @Override public MusicInfo addMixMusicInfo(Map 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; diff --git a/ruoyi-system/src/main/resources/mapper/system/MusicSceneRelateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/MusicSceneRelateMapper.xml index a61e38a..7c6b626 100644 --- a/ruoyi-system/src/main/resources/mapper/system/MusicSceneRelateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/MusicSceneRelateMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -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}) - + select * from music_scene_relate where music_id = #{musicId} - \ No newline at end of file + diff --git a/ruoyi-ui/src/api/playlist/normal.js b/ruoyi-ui/src/api/playlist/normal.js index b567f1d..3436575 100644 --- a/ruoyi-ui/src/api/playlist/normal.js +++ b/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', - method: 'post', + url: '/back/music/', + 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' }) } diff --git a/ruoyi-ui/src/api/playlist/remix.js b/ruoyi-ui/src/api/playlist/remix.js index ec349b2..bf726e7 100644 --- a/ruoyi-ui/src/api/playlist/remix.js +++ b/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' }) } diff --git a/ruoyi-ui/src/views/playlist/normal/index.vue b/ruoyi-ui/src/views/playlist/normal/index.vue index 13d1abc..d3b2344 100644 --- a/ruoyi-ui/src/views/playlist/normal/index.vue +++ b/ruoyi-ui/src/views/playlist/normal/index.vue @@ -154,21 +154,34 @@ - + + + + - - @@ -183,6 +196,7 @@