Merge branch 'dev_v1.3.4_20220919'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherMusicSheetAuditReq.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.req;
 
 
+import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
@@ -42,9 +43,12 @@ public class TeacherMusicSheetAuditReq {
     @ApiModelProperty(value = "是否展示指法(0:否;1:是)")
     private YesOrNoEnum showFingering;  //是否展示指法(0:否;1:是)
 
-    @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)")
+    @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)", hidden = true)
     private YesOrNoEnum hasBeat;  //是否自带节拍器(0:否;1:是)
 
+    @ApiModelProperty(value = "mp3类型 MP3：mp3, MP3_METRONOME:MP3_METRONOME,")
+    private AudioTypeEnum mp3Type;
+
     public String getMusicImg() {
         return musicImg;
     }
@@ -108,4 +112,12 @@ public class TeacherMusicSheetAuditReq {
     public void setHasBeat(YesOrNoEnum hasBeat) {
         this.hasBeat = hasBeat;
     }
+
+    public AudioTypeEnum getMp3Type() {
+        return mp3Type;
+    }
+
+    public void setMp3Type(AudioTypeEnum mp3Type) {
+        this.mp3Type = mp3Type;
+    }
 }

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

@@ -566,4 +566,9 @@ public class MusicSheet implements Serializable {
 		this.hasBeat = hasBeat;
 		return this;
 	}
+
+	public MusicSheet mp3Type(AudioTypeEnum mp3Type) {
+		this.mp3Type = mp3Type;
+		return this;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -436,7 +436,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     .notation(param.getNotation())
                     .canEvaluate(param.getCanEvaluate())
                     .showFingering(param.getShowFingering())
-                    .hasBeat(param.getHasBeat())
+                    //.hasBeat(param.getHasBeat())
+                    .mp3Type(param.getMp3Type())
                     .setState(YesOrNoEnum.YES);
             // 替换曲目id
             replaceMusicSheet(param, musicSheet, originalMusicSheetId);