diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/FileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/FileController.java index 3e7cdc4..a03e7f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/FileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/FileController.java @@ -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 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 430e978..99b666f 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 @@ -47,6 +47,7 @@ public class MusicController extends BaseController { } + // 添加我喜欢的音乐 @RequestMapping("/like/music/{musicId}") public AjaxResult addLikeMusic(@PathVariable String musicId){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/UserCollectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/UserCollectController.java index 5e9eb65..87127fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/UserCollectController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/UserCollectController.java @@ -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 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)); + } + /** * 导出用户收藏音乐列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MusicCollectMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MusicCollectMapper.java index a7ce8b1..d80f95d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MusicCollectMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MusicCollectMapper.java @@ -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); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserCollectMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserCollectMapper.java index c770ae0..ea59232 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserCollectMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserCollectMapper.java @@ -73,4 +73,6 @@ public interface UserCollectMapper List> selectNumUserCollectIdList(List collectIdList); int updateImgByCollectId(UserCollect userCollect); + + List selectUserCollectMusic(@Param("musicId") String musicId,@Param("userId") Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserCollectService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserCollectService.java index cd723f4..340050c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserCollectService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserCollectService.java @@ -62,4 +62,6 @@ public interface IUserCollectService public int deleteUserCollectById(Long id); int cancelBindMusic(MusicCollect musicCollect); + + List selectUserCollectMusic(String musicId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicCollectServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicCollectServiceImpl.java index aac117d..ae49ca9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicCollectServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MusicCollectServiceImpl.java @@ -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()); 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 d98d66e..1feabe7 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 @@ -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 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserCollectServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserCollectServiceImpl.java index 7b9ca0e..96d4311 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserCollectServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserCollectServiceImpl.java @@ -128,4 +128,10 @@ public class UserCollectServiceImpl implements IUserCollectService public int cancelBindMusic(MusicCollect musicCollect) { return musicCollectMapper.delBindMusic(musicCollect); } + + @Override + public List selectUserCollectMusic(String musicId) { + Long userId = SecurityUtils.getUserId(); + return userCollectMapper.selectUserCollectMusic(musicId,userId); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/MusicCollectMapper.xml b/ruoyi-system/src/main/resources/mapper/system/MusicCollectMapper.xml index 81eebc5..a3cea59 100644 --- a/ruoyi-system/src/main/resources/mapper/system/MusicCollectMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/MusicCollectMapper.xml @@ -65,4 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{musicId} + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/UserCollectMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserCollectMapper.xml index 5fa6d7e..7034e30 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserCollectMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserCollectMapper.xml @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + 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} + \ No newline at end of file