rainbowfast/muscipro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

功能完善

Browse Source
This commit is contained in:
menxipeng
2025-09-10 21:15:55 +08:00
parent 69ff450a57
commit e4be0b6795
11 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/FileController.java
View File

@@ -52,12 +52,12 @@ public class FileController extends BaseController {
}
SysUser sysUser = userInfo.getUser();
if (sysUser == null) {
if (StrUtil.isBlank(musicId)) {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.setContentType("application/json;charset=UTF-8");
response.getWriter().write("{\"code\":400,\"msg\":\"音乐ID不能为空\"}");
return;
}
// if (StrUtil.isBlank(musicId)) {
// response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
// response.setContentType("application/json;charset=UTF-8");
// response.getWriter().write("{\"code\":400,\"msg\":\"音乐ID不能为空\"}");
// return;
// }
ShopUser shopUser = userInfo.getShopUser();
if (shopUser == null) {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
@@ -66,14 +66,14 @@ public class FileController extends BaseController {
return;
}
//shopUser = shopUserMapper.selectShopUserByUserId(userId);
MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicId);
if (musicInfo == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("application/json;charset=UTF-8");
response.getWriter().write("{\"code\":404,\"msg\":\"音乐信息不存在\"}");
return;
}
// MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicId);
//
// if (musicInfo == null) {
// response.setStatus(HttpServletResponse.SC_NOT_FOUND);
// response.setContentType("application/json;charset=UTF-8");
// response.getWriter().write("{\"code\":404,\"msg\":\"音乐信息不存在\"}");
// return;
// }
// if (musicInfo.getVip() != null && musicInfo.getVip() == 1) {
// // 判断用户vip

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/MusicController.java
View File

@@ -47,6 +47,7 @@ public class MusicController extends BaseController {
}
// 添加我喜欢的音乐
@RequestMapping("/like/music/{musicId}")
public AjaxResult addLikeMusic(@PathVariable String musicId){

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/UserCollectController.java
View File

@@ -40,13 +40,23 @@ public class UserCollectController extends BaseController
@GetMapping("/list")
public TableDataInfo list(UserCollect userCollect)
{
startPage();
Long userId = SecurityUtils.getUserId();
startPage();
userCollect.setUserId(userId);
List<UserCollect> list = userCollectService.selectUserCollectList(userCollect);
return getDataTableData(list);
}
//检查该歌曲是否已经收藏
@RequestMapping("/checkRep/{musicId}")
public AjaxResult checkCollect(@PathVariable String musicId){
Long userId = SecurityUtils.getUserId();
UserCollect userCollect = new UserCollect();
userCollect.setUserId(userId);
return AjaxResult.success(userCollectService.selectUserCollectMusic(musicId));
}
/**
* 导出用户收藏音乐列表
*/

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper/MusicCollectMapper.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.MusicCollect;
import com.ruoyi.common.core.domain.entity.UserCollect;
import java.util.List;
@@ -61,4 +62,6 @@ public interface MusicCollectMapper
public int deleteMusicCollectByIds(String[] ids);
int delBindMusic(MusicCollect musicCollect);
MusicCollect selectCollectIdAndMusicId(MusicCollect musicCollect);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserCollectMapper.java
View File

@@ -73,4 +73,6 @@ public interface UserCollectMapper
List<Map<String, Object>> selectNumUserCollectIdList(List<Long> collectIdList);
int updateImgByCollectId(UserCollect userCollect);
List<UserCollect> selectUserCollectMusic(@Param("musicId") String musicId,@Param("userId") Long userId);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service/IUserCollectService.java
View File

@@ -62,4 +62,6 @@ public interface IUserCollectService
public int deleteUserCollectById(Long id);
int cancelBindMusic(MusicCollect musicCollect);
List<UserCollect> selectUserCollectMusic(String musicId);
}

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicCollectServiceImpl.java
View File

@@ -61,8 +61,16 @@ public class MusicCollectServiceImpl implements IMusicCollectService
@Override
public int insertMusicCollect(MusicCollect musicCollect)
{
// 先查询是否已经收藏过
MusicCollect musicId = musicCollectMapper.selectCollectIdAndMusicId(musicCollect);
if (musicId != null){
return 1;
}
// 查询出音乐图片
MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicCollect.getMusicId().toString());
if (musicInfo == null){
return 0;
}
UserCollect userCollect = new UserCollect();
userCollect.setImg(musicInfo.getImgAddr());
userCollect.setCollectId(musicCollect.getCollectId());

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

@@ -171,12 +171,12 @@ public class MusicInfoServiceImpl implements IMusicInfoService
public MusicInfo getMusicInfo(Long userId, String musicId) {
MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicId);
if (musicInfo.getVip() != null && musicInfo.getVip()==1){
ShopUser shopUser = shopUserMapper.selectShopUserByUserId(userId);
if (!MusicUtil.getShopIsVip(shopUser)){
return null;
}
}
// if (musicInfo.getVip() != null && musicInfo.getVip()==1){
// ShopUser shopUser = shopUserMapper.selectShopUserByUserId(userId);
// if (!MusicUtil.getShopIsVip(shopUser)){
// return null;
// }
// }
// 查询是否是用户喜欢
UserLikeMusic userLikeMusic = userLikeMusicMapper.selectUserLikeMusicAndUserId(userId, musicId);
@@ -207,27 +207,27 @@ public class MusicInfoServiceImpl implements IMusicInfoService
//TODO:
// Long userId = SecurityUtils.getUserId();
Long userId = 10000L;
String musicId = String.valueOf(param.getMusicId());
//String musicId = String.valueOf(param.getMusicId());
String sceneIds = param.getSceneIds();
String sceneJson = param.getSceneJson();
// 新增混音音乐标签
MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicId);
if (musicInfo != null){
//MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicId);
//if (musicInfo != null){
long newMusicId = IdUtil.getSnowflakeNextId();
param.setMusicId(newMusicId);
param.setMusicType(MusicType.MIXING.getMusicType());
param.setMusicAddr(musicInfo.getMusicAddr());
//param.setMusicAddr(musicInfo.getMusicAddr());
musicInfoMapper.insertMusicInfo(param);
MusicSceneRelate musicSceneRelate = new MusicSceneRelate();
musicSceneRelate.setMusicId(String.valueOf(newMusicId));
musicSceneRelate.setSceneIds(sceneIds);
musicSceneRelate.setUserId(userId);
musicSceneRelate.setSceneInfo(sceneJson);
musicSceneRelate.setSourceMusicId(musicId);
//musicSceneRelate.setSourceMusicId(musicId);
relateMapper.insertMusicSceneRelate(musicSceneRelate);
return musicInfo;
}
return null;
return param;
//}
//return null;
}
@Override

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserCollectServiceImpl.java
View File

@@ -128,4 +128,10 @@ public class UserCollectServiceImpl implements IUserCollectService
public int cancelBindMusic(MusicCollect musicCollect) {
return musicCollectMapper.delBindMusic(musicCollect);
}
@Override
public List<UserCollect> selectUserCollectMusic(String musicId) {
Long userId = SecurityUtils.getUserId();
return userCollectMapper.selectUserCollectMusic(musicId,userId);
}
}

4
ruoyi-system/src/main/resources/mapper/system/MusicCollectMapper.xml
View File

@@ -65,4 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{musicId}
</foreach>
</delete>
<select id="selectCollectIdAndMusicId" resultMap="MusicCollectResult">
SELECT * FROM music_collect where music_id=#{musicId} and collect_id=#{collectId}
</select>
</mapper>

6
ruoyi-system/src/main/resources/mapper/system/UserCollectMapper.xml
View File

@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="selectUserCollectAndUserId" resultMap="UserCollectResult">
SELECT uc.* FROM music_collect mc LEFT JOIN user_collect uc on uc.collect_id=mc.collect_id WHERE mc.music_id=#{musicId} and uc.user_id=#{userId}
SELECT uc.* FROM music_collect mc LEFT JOIN user_collect uc on uc.collect_id=mc.collect_id WHERE mc.music_id=#{musicId} and uc.user_id=#{userId} limit 1
</select>
<select id="selectNumUserCollectIdList" resultType="java.util.Map">
@@ -106,4 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateImgByCollectId">
update user_collect set img=#{img} where collect_id = #{collectId}
</update>
<select id="selectUserCollectMusic" resultMap="UserCollectResult">
SELECT uc.* FROM user_collect uc LEFT JOIN music_collect mc ON uc.collect_id=mc.collect_id WHERE uc.user_id=#{userId} and mc.music_id=#{musicId}
</select>
</mapper>