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

完善c端接口

Browse Source
This commit is contained in:
menxipeng
2025-07-19 14:20:38 +08:00
parent 40f49732a6
commit 028ccf4408
34 changed files with 1278 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MusicCollect.java Normal file
View File

@@ -0,0 +1,67 @@
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;
/**
* 【请填写功能名称】对象 music_collect
*
* @author ruoyi
* @date 2025-07-18
*/
public class MusicCollect extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private String id;
/** 音乐ID */
@Excel(name = "音乐ID")
private Long musicId;
/** 收藏id */
@Excel(name = "收藏id")
private Long collectId;
public void setId(String id)
{
this.id = id;
}
public String getId()
{
return id;
}
public void setMusicId(Long musicId)
{
this.musicId = musicId;
}
public Long getMusicId()
{
return musicId;
}
public void setCollectId(Long collectId)
{
this.collectId = collectId;
}
public Long getCollectId()
{
return collectId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("musicId", getMusicId())
.append("collectId", getCollectId())
.toString();
}
}

63
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ShareInfo.java Normal file
View File

@@ -0,0 +1,63 @@
package com.ruoyi.common.core.domain.entity;
import lombok.Data;
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;
/**
* 【请填写功能名称】对象 share_info
*
* @date 2025-07-19
*/
@Data
public class ShareInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private String id;
/** 用户id */
@Excel(name = "用户id")
private Long userId;
/** 分享描述 */
@Excel(name = "分享描述")
private String shareDecs;
/** 分享音乐 */
@Excel(name = "分享音乐")
private Long musicId;
/** 分享地址 */
@Excel(name = "分享地址")
private String shareAddr;
/** 分享平台 */
@Excel(name = "分享平台")
private String sharePlat;
/** 1 删除 */
@Excel(name = "1 删除")
private Long isDel;
/** 1 审核 */
@Excel(name = "1 审核")
private Long review;
private String username;
private String nickname;
private String headImg;
private String musicName;
private String musicImgAddr;
private String musicAuthor;
}

6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ShopUser.java
View File

@@ -79,4 +79,10 @@ public class ShopUser {
/** 1 删除 */
@Excel(name = "1 删除")
private Long isDel;
private String deviceType;
private String deviceId;
private String headImg;
}

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ShopUserResq.java
View File

@@ -22,4 +22,8 @@ public class ShopUserResq {
private String uMtoken;
private String code;
private String deviceType;
private String deviceId;
}

65
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserCollect.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.common.core.domain.entity;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-07-15
*/
@Data
public class UserCollect extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -24,7 +26,7 @@ public class UserCollect extends BaseEntity
/** 音乐id */
@Excel(name = "音乐id")
private Long musicId;
private Long collectId;
/** 收藏名称 */
@Excel(name = "收藏名称")
@@ -34,66 +36,5 @@ public class UserCollect extends BaseEntity
@Excel(name = "歌单类型 音乐类型 ordinary 混音mixing")
private String collectType;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setMusicId(Long musicId)
{
this.musicId = musicId;
}
public Long getMusicId()
{
return musicId;
}
public void setCollectName(String collectName)
{
this.collectName = collectName;
}
public String getCollectName()
{
return collectName;
}
public void setCollectType(String collectType)
{
this.collectType = collectType;
}
public String getCollectType()
{
return collectType;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("musicId", getMusicId())
.append("collectName", getCollectName())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("collectType", getCollectType())
.toString();
}
}

7
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
View File

@@ -112,7 +112,12 @@ public class LoginUser implements UserDetails
public Long getUserId()
{
return userId;
if (userId != null){
return userId;
}else if(shopUser != null){
return shopUser.getUserId();
}
return null;
}
public void setUserId(Long userId)