From f126ea00d5a6804142dbcd0234deae103286eeec Mon Sep 17 00:00:00 2001
From: menxipeng <menxipeng@gmail.com>
Date: Mon, 1 Sep 2025 20:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E9=9F=B3=E4=B9=90=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0reId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/web/controller/client/MusicController.java | 4 +++-
 .../java/com/ruoyi/common/core/domain/entity/MusicInfo.java   | 2 ++
 .../src/main/resources/mapper/system/MusicInfoMapper.xml      | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/MusicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/MusicController.java
index 28f4b8d..2db72c9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/MusicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/MusicController.java
@@ -155,7 +155,9 @@ public class MusicController extends BaseController {
                                     @RequestParam(required = false) String currentMusicId){
         Long userId = SecurityUtils.getUserId();
         String nextMusicId = musicService.getNextMusicId(userId, playMode, playlistType, categoryId, collectId, reId,currentMusicId);
-        return AjaxResult.success("请求成功",nextMusicId);
+        Map<String,Object> result = new HashMap<>();
+        result.put("musicId",nextMusicId);
+        return AjaxResult.success("请求成功",result);
     }
 
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MusicInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MusicInfo.java
index 01aa2d8..ff4e354 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MusicInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MusicInfo.java
@@ -76,4 +76,6 @@ public class MusicInfo extends BaseEntity
 
     private String fileType;
 
+    private String recommendId;
+
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/MusicInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/MusicInfoMapper.xml
index 4eaa02d..0744e1a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/MusicInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/MusicInfoMapper.xml
@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDel"    column="is_del"    />
         <result property="label"    column="label"    />
         <result property="fileType" column="file_type"/>
+        <result property="recommendId" column="recommend_id"/>
     </resultMap>
 
     <sql id="selectMusicInfoVo">
@@ -139,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectRecommendMusic" resultMap="MusicInfoResult">
-        SELECT mi.* FROM music_recommend mr LEFT JOIN music_info mi on mr.music_id = mi.music_id and mi.is_del=0
+        SELECT mi.*,mr.recommend_id  FROM music_recommend mr LEFT JOIN music_info mi on mr.music_id = mi.music_id and mi.is_del=0
     </select>
 
     <select id="selectMusicByCollectId" resultMap="MusicInfoResult">