update

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

@@ -7,7 +7,7 @@ import lombok.Data;
 public class ImNetworkMusicSheetDto extends ImNetworkBaseDto{
 
     @ApiModelProperty(value = "伴奏编号",required = true)
-    private Long accompanimentId;
+    private Long musicScoreAccompanimentId;
 
     @ApiModelProperty(value = "伴奏下载状态（1下载成功0下载中2下载失败）",required = true)
     private Integer status;
@@ -15,7 +15,7 @@ public class ImNetworkMusicSheetDto extends ImNetworkBaseDto{
     @Override
     public String toString() {
         return "ImNetworkMusicSheetDto{" +
-                "accompanimentId=" + accompanimentId +
+                "accompanimentId=" + musicScoreAccompanimentId +
                 "roomId=" + getRoomId() +
                 ", status=" + status +
                 '}';

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

@@ -1,15 +1,15 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * (CourseScheduleStudentMusicSheet)表实体类
@@ -17,6 +17,7 @@ import java.io.Serializable;
  * @author zx
  * @since 2022-04-02 15:56:01
  */
+@Data
 @ApiModel(value = "course_schedule_student_music_sheet-${tableInfo.comment}")
 public class CourseScheduleStudentMusicSheet implements Serializable {
     @TableId(value = "id_", type = IdType.AUTO)
@@ -37,7 +38,7 @@ public class CourseScheduleStudentMusicSheet implements Serializable {
 
     @TableField("music_sheet_accompaniment_id_")
     @ApiModelProperty(value = "伴奏编号")
-    private Long musicSheetAccompanimentId;
+    private Long musicScoreAccompanimentId;
 
     @TableField("play_status_")
     @ApiModelProperty(value = "原音播放状态（1是0否）")
@@ -63,94 +64,5 @@ public class CourseScheduleStudentMusicSheet implements Serializable {
     @ApiModelProperty(value = "${column.comment}")
     private Date updateTime;
 
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Integer getDownStatus() {
-        return downStatus;
-    }
-
-    public void setDownStatus(Integer downStatus) {
-        this.downStatus = downStatus;
-    }
-
-    public Long getMusicSheetAccompanimentId() {
-        return musicSheetAccompanimentId;
-    }
-
-    public void setMusicSheetAccompanimentId(Long musicSheetAccompanimentId) {
-        this.musicSheetAccompanimentId = musicSheetAccompanimentId;
-    }
-
-    public Integer getPlayStatus() {
-        return playStatus;
-    }
-
-    public void setPlayStatus(Integer playStatus) {
-        this.playStatus = playStatus;
-    }
-
-    public Integer getAccompanimentPlayStatus() {
-        return accompanimentPlayStatus;
-    }
-
-    public void setAccompanimentPlayStatus(Integer accompanimentPlayStatus) {
-        this.accompanimentPlayStatus = accompanimentPlayStatus;
-    }
-
-    public Integer getUserType() {
-        return userType;
-    }
-
-    public void setUserType(Integer userType) {
-        this.userType = userType;
-    }
-
-    public Integer getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Integer speed) {
-        this.speed = speed;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
 }
 

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

@@ -344,7 +344,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void pushDownloadMusicSheetMsg(ImNetworkMusicSheetDto musicSheetDto) throws Exception {
         String roomId = Optional.ofNullable(musicSheetDto).map(ImNetworkBaseDto::getRoomId).orElseThrow(() -> new BizException("房间编号不能为空"));
-        Long accompanimentId = Optional.of(musicSheetDto).map(ImNetworkMusicSheetDto::getAccompanimentId).orElseThrow(() -> new BizException("伴奏编号不能为空"));
+        Long accompanimentId = Optional.of(musicSheetDto).map(ImNetworkMusicSheetDto::getMusicScoreAccompanimentId).orElseThrow(() -> new BizException("伴奏编号不能为空"));
         log.info("pushDownloadMusicSheetMsg: roomId:{} ,accompanimentId:{}", roomId,accompanimentId);
         Long userId = sysUserService.getUserId();
         List<CourseScheduleStudentMusicSheetResult> scheduleStudentMusicSheetResults = courseScheduleStudentMusicSheetService.getDao().
@@ -358,14 +358,14 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             Set<Long> studentIds = studentPayments.stream().map(CourseScheduleStudentPayment::getUserId).collect(Collectors.toSet());
             studentIds.forEach(e -> {
                 CourseScheduleStudentMusicSheetResult musicSheet = new CourseScheduleStudentMusicSheetResult();
-                musicSheet.setMusicSheetAccompanimentId(accompanimentId);
+                musicSheet.setMusicScoreAccompanimentId(accompanimentId);
                 musicSheet.setSpeed(accompaniment.getSpeed());
                 musicSheet.setCourseScheduleId(Long.parseLong(roomId));
                 musicSheet.setUserId(e);
                 scheduleStudentMusicSheetResults.add(musicSheet);
             });
             CourseScheduleStudentMusicSheetResult musicSheet = new CourseScheduleStudentMusicSheetResult();
-            musicSheet.setMusicSheetAccompanimentId(accompanimentId);
+            musicSheet.setMusicScoreAccompanimentId(accompanimentId);
             musicSheet.setSpeed(accompaniment.getSpeed());
             musicSheet.setCourseScheduleId(Long.parseLong(roomId));
             musicSheet.setUserId(userId);
@@ -553,7 +553,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void musicSheetDownNotify(ImNetworkMusicSheetDto musicSheetDto) throws Exception {
         String roomId = Optional.ofNullable(musicSheetDto).map(ImNetworkBaseDto::getRoomId).orElseThrow(() -> new BizException("房间编号不能为空"));
-        Long accompanimentId = Optional.of(musicSheetDto).map(ImNetworkMusicSheetDto::getAccompanimentId).orElseThrow(() -> new BizException("伴奏编号不能为空"));
+        Long accompanimentId = Optional.of(musicSheetDto).map(ImNetworkMusicSheetDto::getMusicScoreAccompanimentId).orElseThrow(() -> new BizException("伴奏编号不能为空"));
         Integer status = Optional.of(musicSheetDto).map(ImNetworkMusicSheetDto::getStatus).orElseThrow(() -> new BizException("伴奏下载状态不能为空"));
         log.info("musicSheetDownNotify: roomId:{} ,accompanimentId:{} ,status:{}", roomId,accompanimentId,status);
         Long userId = sysUserService.getUserId();