Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherClassCourseSchudeleDto.java

@@ -84,6 +84,9 @@ public class TeacherClassCourseSchudeleDto {
     @ApiModelProperty("直播客户端")
     private String os;
 
+    @ApiModelProperty("声部编号")
+    private String subjectId;
+
     @ApiModelProperty("课程组编号")
     private String musicGroupId;
 
@@ -294,4 +297,17 @@ public class TeacherClassCourseSchudeleDto {
     public void setId(Long id) {
         this.id = id;
     }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public TeacherClassCourseSchudeleDto subjectId(String subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -3767,6 +3767,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			// 课程组信息
 			Map<String, ImLiveBroadcastRoomDto> liveRoomMap = getCourseLiveRoomMap(dataList);
 
+			ImLiveBroadcastRoomDto liveRoom;
 			for (TeacherClassCourseSchudeleDto e : dataList) {
 				e.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(e.getClassGroupId().intValue(),new Date()));
 				e.setTotalClassTimes(courseScheduleDao.countCurrentCourseTime(e.getCourseScheduleId()));
@@ -3783,7 +3784,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 				// 直播课直播间配置
 				if (liveRoomMap.containsKey(e.getMusicGroupId())) {
-					e.setOs(liveRoomMap.get(e.getMusicGroupId()).getOs());
+					liveRoom = liveRoomMap.get(e.getMusicGroupId());
+					e.subjectId(liveRoom.getSubjectId()).setOs(liveRoom.getOs());
 				}
 			}
 		}

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

@@ -52,7 +52,10 @@ public class RoomResult {
     private @Getter @Setter Integer studentNums;
 
     @ApiModelProperty("直播间编号")
-    public String liveRoomId;
+    private String liveRoomId;
+
+    @ApiModelProperty("声部编号")
+    private String subjectId;
 
     public RoomResult rtcRoomConfig(RTCRoomConfig rtcRoomConfig) {
         this.rtcRoomConfig = rtcRoomConfig;
@@ -64,6 +67,11 @@ public class RoomResult {
         return this;
     }
 
+    public RoomResult subjectId(String subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
     @Data
     public static class MemberResult {
         String userId;

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

@@ -322,7 +322,7 @@ public class RoomServiceImpl implements RoomService {
             }
 
             // 返回直播间配置参数
-            roomResult.setLiveRoomId(liveRoom.getRoomUid());
+            roomResult.subjectId(liveRoom.getSubjectId()).setLiveRoomId(liveRoom.getRoomUid());
 
             // 主动触发用户加入直播间
             // imLiveBroadcastRoomService.joinRoom(liveRoom.getRoomUid(), sysUser.getId());