功能完善
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -47,6 +47,7 @@ public class MusicController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 添加我喜欢的音乐
|
||||
@RequestMapping("/like/music/{musicId}")
|
||||
public AjaxResult addLikeMusic(@PathVariable String musicId){
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出用户收藏音乐列表
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user