update

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

@@ -1,13 +1,17 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 import org.apache.commons.lang3.builder.ToStringBuilder;
-import java.util.Date;
 
 /**
  * 曲谱伴奏表
@@ -15,6 +19,10 @@ import java.util.Date;
  * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
 @ApiModel(value = "music_sheet_accompaniment-曲谱伴奏表")
 public class MusicSheetAccompaniment extends BaseEntity {
 
@@ -24,19 +32,19 @@ public class MusicSheetAccompaniment extends BaseEntity {
 
     @TableField("music_sheet_id_")
     @ApiModelProperty(value = "曲谱ID")
-    private Long musicSheetId;  //曲谱ID
+    private Long examSongId;  //曲谱ID
 
     @TableField("music_subject_")
     @ApiModelProperty(value = "声部")
-    private String musicSubject;  //声部
+    private String subjectId;  //声部
 
     @TableField("audio_file_url_")
     @ApiModelProperty(value = "MP3原声音频文件URL")
-    private String audioFileUrl;  //MP3原声音频文件URL
+    private String mp3Url;  //MP3原声音频文件URL
 
 	@TableField("metronome_url_")
 	@ApiModelProperty(value = "MP3节拍器伴奏")
-	private String metronomeUrl;  //MP3原声音频文件URL
+	private String metronomeMp3Url;  //MP3原声音频文件URL
 
 	@TableField("track_")
 	@ApiModelProperty(value = "类型")
@@ -58,95 +66,6 @@ public class MusicSheetAccompaniment extends BaseEntity {
     @ApiModelProperty(value = "创建人(老师或者是后台平台用户)")
     private Long createBy;  //创建人(老师或者是后台平台用户)
 
-
-	public MusicSheetAccompaniment setId(Long id) {
-	    this.id = id;
-	    return this;
-	}
-
-	public Integer getSpeed() {
-		return speed;
-	}
-
-	public void setSpeed(Integer speed) {
-		this.speed = speed;
-	}
-
-	public String getMetronomeUrl() {
-		return metronomeUrl;
-	}
-
-	public void setMetronomeUrl(String metronomeUrl) {
-		this.metronomeUrl = metronomeUrl;
-	}
-
-	public String getTrack() {
-		return track;
-	}
-
-	public void setTrack(String track) {
-		this.track = track;
-	}
-
-	public Long getId() {
-	    return this.id;
-	}
-
-	public MusicSheetAccompaniment setMusicSheetId(Long musicSheetId) {
-	    this.musicSheetId = musicSheetId;
-	    return this;
-	}
-
-	public Long getMusicSheetId() {
-	    return this.musicSheetId;
-	}
-
-	public MusicSheetAccompaniment setMusicSubject(String musicSubject) {
-	    this.musicSubject = musicSubject;
-	    return this;
-	}
-
-	public String getMusicSubject() {
-	    return this.musicSubject;
-	}
-
-	public MusicSheetAccompaniment setAudioFileUrl(String audioFileUrl) {
-	    this.audioFileUrl = audioFileUrl;
-	    return this;
-	}
-
-	public String getAudioFileUrl() {
-	    return this.audioFileUrl;
-	}
-
-	public MusicSheetAccompaniment setSortNumber(Integer sortNumber) {
-	    this.sortNumber = sortNumber;
-	    return this;
-	}
-
-	public Integer getSortNumber() {
-	    return this.sortNumber;
-	}
-
-	public MusicSheetAccompaniment setCreateTime(java.util.Date createTime) {
-	    this.createTime = createTime;
-	    return this;
-	}
-
-	public java.util.Date getCreateTime() {
-	    return this.createTime;
-	}
-
-	public MusicSheetAccompaniment setCreateBy(Long createBy) {
-	    this.createBy = createBy;
-	    return this;
-	}
-
-	public Long getCreateBy() {
-	    return this.createBy;
-	}
-
-
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);

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

@@ -83,17 +83,17 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
         List<Long> musicSheetIdList = records.stream().map(CourseCoursewareVo::getMusicSheetId).collect(Collectors.toList());
         List<MusicSheetAccompaniment> musicSheetAccompanimentList = musicSheetAccompanimentDao.selectList(
                 Wrappers.<MusicSheetAccompaniment>lambdaQuery()
-                        .in(MusicSheetAccompaniment::getMusicSheetId, musicSheetIdList));
+                        .in(MusicSheetAccompaniment::getExamSongId, musicSheetIdList));
         if (CollectionUtils.isNotEmpty(musicSheetAccompanimentList)) {
             Map<Long, List<MusicSheetAccompaniment>> map = musicSheetAccompanimentList.stream()
-                                                          .collect( Collectors.groupingBy(MusicSheetAccompaniment::getMusicSheetId));
+                                                          .collect( Collectors.groupingBy(MusicSheetAccompaniment::getExamSongId));
             for (CourseCoursewareVo record : records) {
                 List<MusicSheetAccompaniment> musicSheetAccompaniments = map.get(record.getMusicSheetId());
                 if (CollectionUtils.isEmpty(musicSheetAccompaniments)) {
                     continue;
                 }
                 String url = musicSheetAccompaniments.stream()
-                                                         .map(MusicSheetAccompaniment::getAudioFileUrl)
+                                                         .map(MusicSheetAccompaniment::getMp3Url)
                                                          .collect(Collectors.joining(","));
                 record.setMp3url(url);
             }

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

@@ -365,7 +365,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         Long accompanimentId = Optional.of(musicSheetDto).map(ImNetworkMusicSheetDto::getMusicScoreAccompanimentId).orElseThrow(() -> new BizException("伴奏编号不能为空"));
         log.info("pushDownloadMusicSheetMsg: roomId:{} ,accompanimentId:{}", roomId,accompanimentId);
         Long userId = sysUserService.getUserId();
-        MusicSheetAccompaniment accompaniment = musicSheetAccompanimentService.lambdaQuery().eq(MusicSheetAccompaniment::getMusicSheetId,accompanimentId)
+        MusicSheetAccompaniment accompaniment = musicSheetAccompanimentService.lambdaQuery().eq(MusicSheetAccompaniment::getExamSongId,accompanimentId)
                 .last("LIMIT 1").one();
         List<CourseScheduleStudentMusicSheetResult> scheduleStudentMusicSheetResults = courseScheduleStudentMusicSheetService.getDao().
                 queryBySheetIdAndCourseId(accompaniment.getId(), Long.parseLong(roomId), null, null, 0);

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

@@ -1,13 +1,13 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -34,7 +34,7 @@ public class MusicSheetAccompanimentServiceImpl extends ServiceImpl<MusicSheetAc
     public List<MusicSheetAccompaniment> getByMusicSheetId(Long musicSheetId) {
 
         return this.lambdaQuery()
-                .eq(MusicSheetAccompaniment::getMusicSheetId,musicSheetId)
+                .eq(MusicSheetAccompaniment::getExamSongId,musicSheetId)
                 .list();
     }
 

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

@@ -229,7 +229,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
         Long sheetId = musicSheet.getId();
         List<MusicSheetAccompaniment> list = musicSheetDto.getBackground();
-        list.forEach(musicSheetAccompaniment -> musicSheetAccompaniment.setMusicSheetId(sheetId).setCreateBy(userId).setCreateTime(new Date()));
+        list.forEach(musicSheetAccompaniment -> musicSheetAccompaniment.setExamSongId(sheetId).setCreateBy(userId).setCreateTime(new Date()));
         return musicSheetAccompanimentService.saveBatch(list);
 
     }
@@ -758,12 +758,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             // 替换 伴奏
             List<MusicSheetAccompaniment> musicSheetAccompanimentList = musicSheetAccompanimentService.getByMusicSheetId(
                                                                                                               musicSheet.getId()).stream()
-                                                                                                      .peek(musicSheetAccompaniment -> musicSheetAccompaniment.setMusicSheetId(
+                                                                                                      .peek(musicSheetAccompaniment -> musicSheetAccompaniment.setExamSongId(
                                                                                                               originalMusicSheetId))
                                                                                                       .collect(Collectors.toList());
             List<MusicSheetAccompaniment> originalMusicSheetAccompanimentList = musicSheetAccompanimentService.getByMusicSheetId(
                                                                                                                       originalMusicSheetId).stream()
-                                                                                                              .peek(musicSheetAccompaniment -> musicSheetAccompaniment.setMusicSheetId(
+                                                                                                              .peek(musicSheetAccompaniment -> musicSheetAccompaniment.setExamSongId(
                                                                                                                       musicSheet.getId()))
                                                                                                               .collect(Collectors.toList());
 
@@ -1314,7 +1314,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 String[] audioFileUrls = sheetExport.getAudioFileUrls().split("[,，]");
                 for (String audioFileUrl : audioFileUrls) {
                     MusicSheetAccompaniment musicSheetAccompaniment = new MusicSheetAccompaniment();
-                    musicSheetAccompaniment.setAudioFileUrl(audioFileUrl);
+                    musicSheetAccompaniment.setMp3Url(audioFileUrl);
                     background.add(musicSheetAccompaniment);
                 }
                 musicSheetDto.setBackground(background);

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetAccompanimentMapper.xml

@@ -5,9 +5,9 @@
 
 	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
 	     <id column="id_" jdbcType="BIGINT" property="id" />
-		 <result column="music_sheet_id_" jdbcType="BIGINT" property="musicSheetId" />
-		 <result column="music_subject_" jdbcType="VARCHAR" property="musicSubject" />
-		 <result column="audio_file_url_" jdbcType="VARCHAR" property="audioFileUrl" />
+		 <result column="music_sheet_id_" jdbcType="BIGINT" property="examSongId" />
+		 <result column="music_subject_" jdbcType="VARCHAR" property="subjectId" />
+		 <result column="audio_file_url_" jdbcType="VARCHAR" property="mp3Url" />
 		 <result column="sort_number_" jdbcType="TINYINT" property="sortNumber" />
 		 <result column="speed_" jdbcType="TINYINT" property="speed" />
 		 <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />