Merge remote-tracking branch 'origin/test' into test

mec-im/src/main/java/com/ym/pojo/MusicScoreData.java

@@ -1,7 +1,7 @@
 package com.ym.pojo;
 
 public class MusicScoreData {
-	private Long roomId;
+	private String roomId;
 	private Integer musicScoreAccompanimentId;
 	private Integer userId;
 	private Integer userType;
@@ -39,11 +39,11 @@ public class MusicScoreData {
 		this.status = status;
 	}
 
-	public Long getRoomId() {
+	public String getRoomId() {
 		return roomId;
 	}
 
-	public void setRoomId(Long roomId) {
+	public void setRoomId(String roomId) {
 		this.roomId = roomId;
 	}
 }

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1527,7 +1527,8 @@ public class RoomServiceImpl implements RoomService {
     @Transactional(rollbackFor = Exception.class)
     public void pushDownloadMusicScoreMsg(MusicScoreData musicScoreData) throws Exception {
         SysUser authUser = sysUserFeignService.queryUserInfo();
-        Long courseScheduleId = musicScoreData.getRoomId();
+        String roomId = musicScoreData.getRoomId();
+        Long courseScheduleId = Long.parseLong(roomId.substring(1));
         List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores =
                 courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(musicScoreData.getMusicScoreAccompanimentId(),
                         courseScheduleId,null,null,0);
@@ -1556,7 +1557,7 @@ public class RoomServiceImpl implements RoomService {
         }
         MusicScoreMessage musicScoreMessage = JSON.parseObject(JSON.toJSONString(accompaniment), MusicScoreMessage.class);
         MusicScoreDownloadMessageMessage msg = new MusicScoreDownloadMessageMessage(musicScoreMessage);
-        imHelper.publishMessage(authUser.getId().toString(), courseScheduleId.toString(), msg, 0);
+        imHelper.publishMessage(authUser.getId().toString(), roomId, msg, 0);
     }
 
     @Override
@@ -1594,7 +1595,8 @@ public class RoomServiceImpl implements RoomService {
     public void adjustMusicScore(MusicScoreData musicScoreData) throws Exception {
         SysUser authUser = sysUserFeignService.queryUserInfo();
         Integer studentId = authUser.getId();
-        Long scheduleId = musicScoreData.getRoomId();
+        String roomId = musicScoreData.getRoomId();
+        Long scheduleId = Long.parseLong(roomId.substring(1));
         Integer status = musicScoreData.getStatus();
         Integer accompanimentId = musicScoreData.getMusicScoreAccompanimentId();
 
@@ -1613,7 +1615,7 @@ public class RoomServiceImpl implements RoomService {
         //给老师发送学员曲目下载状态
         CourseSchedule courseSchedule = courseScheduleDao.get(scheduleId);
         MusicScoreDownloadStatusMessage statusMessage = new MusicScoreDownloadStatusMessage(status,studentId,accompanimentId);
-        imHelper.publishMessage(studentId.toString(),courseSchedule.getActualTeacherId().toString(), scheduleId.toString(),statusMessage);
+        imHelper.publishMessage(studentId.toString(),courseSchedule.getActualTeacherId().toString(), roomId,statusMessage);
     }
 
     @Override