|
|
@@ -5,6 +5,9 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.microsvc.toolkit.middleware.live.LivePluginContext;
|
|
|
+import com.microsvc.toolkit.middleware.live.LivePluginService;
|
|
|
+import com.microsvc.toolkit.middleware.live.message.LiveRoomMessage;
|
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
|
import com.ym.mec.biz.dal.dto.*;
|
|
|
@@ -195,7 +198,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
private LessonExaminationService lessonExaminationService;
|
|
|
@Autowired
|
|
|
private ImLiveBroadcastRoomService imLiveBroadcastRoomService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private LivePluginContext livePluginContext;
|
|
|
@Autowired
|
|
|
private ImLiveRoomVideoService imLiveRoomVideoService;
|
|
|
|
|
|
@@ -1172,6 +1176,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
courseScheduleDto.setOs(courseScheduleDto.getLiveBroadcastRoom().getOs());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // 直播课判断时间，提前30分钟将课程改为进行中
|
|
|
+
|
|
|
+ Integer studentRemindTime = Integer.parseInt(sysConfigService.findByParamName(SysConfigService.LIVE_CLASS_START_REMIND_TIME).getParanValue());
|
|
|
+ for (CourseScheduleDto record : studentCourseSchedulesWithDate) {
|
|
|
+ if (CourseScheduleType.LIVE.equals(record.getType()) && CourseStatusEnum.NOT_START.equals(record.getStatus())) {
|
|
|
+ Date date = DateUtil.addMinutes(new Date(), studentRemindTime);
|
|
|
+ if (date.after(record.getStartClassTime())) {
|
|
|
+ record.setStatus(CourseStatusEnum.UNDERWAY);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private Map<String, List<ImLiveRoomVideoVo>> getLiveRecord(List<String> roomIds) {
|
|
|
@@ -3020,6 +3036,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
|
|
|
Map<Long, CourseSchedule> oldCourseScheduleMap = oldCourseScheduleList.stream().collect(Collectors.toMap(CourseSchedule::getId, c -> c));
|
|
|
|
|
|
+ List<CourseSchedule> liveCourseSchedules = Lists.newArrayList();
|
|
|
for(CourseSchedule newCourseSchedule : newCourseSchedules){
|
|
|
|
|
|
//获取数据库中的记录
|
|
|
@@ -3075,6 +3092,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 直播课发送推送消息
|
|
|
+ if (LIVE.equals(oldCourseSchedule.getGroupType()) && StringUtils.isNotBlank(oldCourseSchedule.getLiveRoomId())) {
|
|
|
+ // 日期，时间，时长，主教老师不一致时，发送消息
|
|
|
+ if (newCourseSchedule.getClassDate() != oldCourseSchedule.getClassDate()
|
|
|
+ || newCourseSchedule.getStartClassTime() != oldCourseSchedule.getStartClassTime()
|
|
|
+ || newCourseSchedule.getEndClassTime() != oldCourseSchedule.getEndClassTime()
|
|
|
+ || newCourseSchedule.getActualTeacherId() != oldCourseSchedule.getActualTeacherId().intValue()) {
|
|
|
+ liveCourseSchedules.add(oldCourseSchedule);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if(!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())){
|
|
|
if (newCourseSchedule.getTeachingTeacherIdList().contains(newCourseSchedule.getActualTeacherId())){
|
|
|
throw new BizException("主教和助教不可重复");
|
|
|
@@ -3517,6 +3545,46 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
+
|
|
|
+ // 直播课消息推送
|
|
|
+ if (CollectionUtils.isNotEmpty(liveCourseSchedules)) {
|
|
|
+
|
|
|
+ liveCourseSchedules.parallelStream().forEach(item -> {
|
|
|
+
|
|
|
+ ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(item.getLiveRoomId());
|
|
|
+ if (Objects.isNull(liveRoom)) {
|
|
|
+ log.warn("liveRoom is null, liveRoomId:{}", item.getLiveRoomId());
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ try {
|
|
|
+ LivePluginService pluginService = livePluginContext.getPluginService(liveRoom.getServiceProvider());
|
|
|
+
|
|
|
+ LiveRoomMessage message = new LiveRoomMessage();
|
|
|
+ message.setIsIncludeSender(1);
|
|
|
+ message.setFromUserId(item.getActualTeacherId().toString());
|
|
|
+ message.setToChatRoomId(item.getLiveRoomId());
|
|
|
+ message.setObjectName(LiveRoomMessage.LIVE_STATUS_CHANGE);
|
|
|
+
|
|
|
+ // 发送用户信息
|
|
|
+ LiveRoomMessage.MessageUser messageUser = LiveRoomMessage.MessageUser.builder()
|
|
|
+ .sendUserId("")
|
|
|
+ .sendUserName("")
|
|
|
+ .avatarUrl("")
|
|
|
+ .build();
|
|
|
+
|
|
|
+ message.setContent(LiveRoomMessage.MessageContent.builder()
|
|
|
+ .reason("课程信息已变更")
|
|
|
+ .targetIds(Lists.newArrayList())
|
|
|
+ .sendUserInfo(messageUser).build());
|
|
|
+
|
|
|
+ pluginService.sendChatRoomMessage(message);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("liveRoom error", e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
return BaseController.succeed();
|
|
|
}
|
|
|
|
|
|
@@ -3992,6 +4060,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
CourseAttendanceDetailHeadInfoDto courseAttendanceDetailHeadInfoDto = courseScheduleDao.findByCourse(courseScheduleId);
|
|
|
courseAttendanceDetailHeadInfoDto.setLatestAttendanceTime(studentAttendanceDao.findLatestAttendanceDate(courseScheduleId));
|
|
|
+ courseAttendanceDetailHeadInfoDto.setStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.NORMAL));
|
|
|
courseAttendanceDetailHeadInfoDto.setLeaveStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.LEAVE));
|
|
|
courseAttendanceDetailHeadInfoDto.setTruantStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.TRUANT));
|
|
|
courseAttendanceDetailHeadInfoDto.setLateStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.LATE));
|
|
|
@@ -6228,7 +6297,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
// 定时任务更新课程状态为进行中，判断当前课程状态是否匹配
|
|
|
- if (CourseStatusEnum.NOT_START == courseSchedule.getStatus()) {
|
|
|
+ int studentRemindTime = Integer.parseInt(sysConfigService.findByParamName(SysConfigService.LIVE_CLASS_START_REMIND_TIME).getParanValue());
|
|
|
+
|
|
|
+ Date date = DateUtil.startDateAndEndTime(courseSchedule.getClassDate(), courseSchedule.getStartClassTime());
|
|
|
+ date = DateUtil.addMinutes(date, -studentRemindTime);
|
|
|
+ // 课程是否开始
|
|
|
+ if(CourseStatusEnum.NOT_START.equals(courseSchedule.getStatus()) && date.after(new Date())) {
|
|
|
throw new BizException("直播课暂未开启，请稍后重试");
|
|
|
}
|
|
|
if (CourseStatusEnum.OVER == courseSchedule.getStatus()) {
|
zouxuan