Browse Source

网络教室伴奏

zouxuan 4 years ago
parent
commit
bc9c6f291c

+ 3 - 3
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;
 	}
 }

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

@@ -1538,7 +1538,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);
@@ -1567,7 +1568,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
@@ -1605,7 +1606,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();
 
@@ -1624,7 +1626,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

+ 1 - 1
mec-teacher/src/main/resources/bootstrap-test.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f9d46b0a-9847-48ae-8e4b-216c7a3eb466
+spring.cloud.nacos.config.namespace=f753d9d9-4bb2-4df6-a483-da9e169617c4
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}