|
|
@@ -3562,12 +3562,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
// 查询最新课程信息
|
|
|
CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
|
|
|
// 直播课关联直播间编号
|
|
|
- String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
|
|
|
+ String liveRoomId = item.getLiveRoomId();
|
|
|
|
|
|
if (newCourseSchedule.getClassDate().getTime() > item.getClassDate().getTime()) {
|
|
|
newCourseSchedule = item;
|
|
|
- // 关联直播间编号
|
|
|
- liveRoomId = item.getLiveRoomId();
|
|
|
+ } else {
|
|
|
+ liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
|
|
|
}
|
|
|
|
|
|
ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(liveRoomId);
|
|
|
@@ -6312,11 +6312,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
throw new BizException("请先进入直播课教室");
|
|
|
}
|
|
|
|
|
|
+ String autoCloseNetworkRoomTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_AFTER_BUFFER_TIME, courseSchedule.getTenantId());
|
|
|
+ if (StringUtils.isEmpty(autoCloseNetworkRoomTime)) {
|
|
|
+ autoCloseNetworkRoomTime = "15";
|
|
|
+ }
|
|
|
+
|
|
|
return CourseScheduleWrapper.LiveCourseSchedule.builder()
|
|
|
.liveRoomId(liveRoomId)
|
|
|
.subjectId(liveBroadcastRoom.getSubjectId())
|
|
|
.autoCloseFlag(true)
|
|
|
- .autoCloseNetworkRoomTime(getCloseNetworkRoomTime(courseSchedule, continueCourseTime))
|
|
|
+ //.autoCloseNetworkRoomTime(getCloseNetworkRoomTime(courseSchedule, continueCourseTime))
|
|
|
+ .autoCloseNetworkRoomTime(autoCloseNetworkRoomTime)
|
|
|
.surplusTime(DateUtil.secondsBetween(new Date(), courseSchedule.getEndClassTime()))
|
|
|
.timestamp(DateTime.now().getMillis())
|
|
|
.courseScheduleTimes(courseScheduleTimes)
|
