Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author Joburgess
@@ -58,6 +59,15 @@ public class TeacherClassHeadInfo {
 
     private String teachMode;
 
+    @ApiModelProperty(value = "单节课时")
+    private Integer singleClassMinutes;
+
+    @ApiModelProperty(value = "课程计划列表")
+    private List<CourseSchedule> courseSchedules;
+
+    @ApiModelProperty("直播间信息")
+    private ImLiveBroadcastRoomDto liveBroadcastRoom;
+
     public Integer getSurplusClassTimes() {
         return surplusClassTimes;
     }
@@ -185,4 +195,28 @@ public class TeacherClassHeadInfo {
     public void setCourseScheduleType(CourseSchedule.CourseScheduleType courseScheduleType) {
         CourseScheduleType = courseScheduleType;
     }
+
+    public Integer getSingleClassMinutes() {
+        return singleClassMinutes;
+    }
+
+    public void setSingleClassMinutes(Integer singleClassMinutes) {
+        this.singleClassMinutes = singleClassMinutes;
+    }
+
+    public List<CourseSchedule> getCourseSchedules() {
+        return courseSchedules;
+    }
+
+    public void setCourseSchedules(List<CourseSchedule> courseSchedules) {
+        this.courseSchedules = courseSchedules;
+    }
+
+    public ImLiveBroadcastRoomDto getLiveBroadcastRoom() {
+        return liveBroadcastRoom;
+    }
+
+    public void setLiveBroadcastRoom(ImLiveBroadcastRoomDto liveBroadcastRoom) {
+        this.liveBroadcastRoom = liveBroadcastRoom;
+    }
 }

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

@@ -1765,6 +1765,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (classGroup.getType() == ClassGroupTypeEnum.VIP || classGroup.getType() == ClassGroupTypeEnum.LIVE) {
             String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(classGroupId);
             teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums, ","));
+
+            // 查询课程信息
+            if (StringUtils.isNotBlank(classGroup.getMusicGroupId())) {
+
+                VipGroup vipGroup = vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
+
+                // 返回课程相关信息
+                teacherClassHeadInfo.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class));
+                // 单节课时
+                teacherClassHeadInfo.setSingleClassMinutes(vipGroup.getSingleClassMinutes());
+                // 直播间配置
+                if (StringUtils.isNotEmpty(vipGroup.getLiveConfigJson())) {
+                    teacherClassHeadInfo.setLiveBroadcastRoom(JSON.parseObject(vipGroup.getLiveConfigJson(), ImLiveBroadcastRoomDto.class));
+                }
+            }
         }
 
         if (classGroup.getType() == ClassGroupTypeEnum.PRACTICE) {