调整乐谱控制类

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -13,6 +14,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 曲谱表
@@ -33,7 +35,6 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "曲谱名称")
     private String musicSheetName;  //曲谱名称
 
-    @NotNull(message = "曲谱来源不能为空")
     @TableField("user_id_")
     @ApiModelProperty(value = "曲谱来源(老师ID或后台管理用户ID)")
     private Long userId;  //曲谱来源(老师ID或后台管理用户ID)
@@ -75,7 +76,6 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
     private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
-    @NotNull(message = "审核状态不能为空!")
     @TableField("audit_status_")
     @ApiModelProperty(value = "审核状态")
     private Integer auditStatus;  //审核状态
@@ -96,10 +96,12 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "曲谱价格")
     private java.math.BigDecimal musicPrice;  //曲谱价格
 
+    @NotBlank(message = "音频文件存储路径不能为空!")
     @TableField("audio_file_url_")
     @ApiModelProperty(value = "音频文件存储路径")
     private String audioFileUrl;  //音频文件存储路径
 
+    @NotBlank(message = "XML文件存储路径不能为空!")
     @TableField("xml_file_url_")
     @ApiModelProperty(value = "XML文件存储路径")
     private String xmlFileUrl;  //XML文件存储路径
@@ -126,6 +128,7 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("remark_")
     @ApiModelProperty(value = "备注")
+    @JsonIgnore
     private String remark;  //备注
 
 
@@ -322,10 +325,26 @@ public class MusicSheet extends BaseEntity {
 	    return this.remark;
 	}
 
+    @JsonIgnore
 	public int pageNo;
+
+    @JsonIgnore
     public int pageSize;
+
+    @JsonIgnore
     public String search;
 
+    public List<MusicSheetAccompaniment> getBackground() {
+        return background;
+    }
+
+    public void setBackground(List<MusicSheetAccompaniment> background) {
+        this.background = background;
+    }
+
+    @ApiModelProperty(value = "mp3关联的主音或者伴奏文件")
+    public List<MusicSheetAccompaniment> background; //mp3关联的主音或者伴奏文件
+
     public String getSearch() {
         return search;
     }