fix

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

@@ -3563,57 +3563,57 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			CompletableFuture.runAsync(() ->
 
-					liveCourseSchedules.parallelStream().forEach(item -> {
+				liveCourseSchedules.parallelStream().forEach(item -> {
 
-						// 是否是连堂课
-						String continueCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME, item.getTenantId());
-						if (StringUtils.isEmpty(continueCourseTime)) {
-							continueCourseTime = "5";
-						}
+					// 是否是连堂课
+					String continueCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME, item.getTenantId());
+					if (StringUtils.isEmpty(continueCourseTime)) {
+						continueCourseTime = "5";
+					}
 
-						// 查询最新课程信息
-						CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
-						if (newCourseSchedule.getClassDate().getTime() > item.getClassDate().getTime()) {
-							newCourseSchedule = item;
-						}
-						// 直播课关联直播间编号
-						String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
+					// 查询最新课程信息
+					CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
+					if (newCourseSchedule.getClassDate().getTime() > item.getClassDate().getTime()) {
+						newCourseSchedule = item;
+					}
+					// 直播课关联直播间编号
+					String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
 
-						if (StringUtils.isBlank(liveRoomId)) {
-							liveRoomId = item.getLiveRoomId();
-						}
+					if (StringUtils.isBlank(liveRoomId)) {
+						liveRoomId = item.getLiveRoomId();
+					}
 
-						ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(liveRoomId);
-						if (Objects.isNull(liveRoom)) {
-							log.warn("liveRoom sendChatRoomMessage is null, liveRoomId:{}", liveRoomId);
-							return;
-						}
+					ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(liveRoomId);
+					if (Objects.isNull(liveRoom)) {
+						log.warn("liveRoom sendChatRoomMessage is null, liveRoomId:{}", liveRoomId);
+						return;
+					}
 
-						try {
-							LivePluginService pluginService = livePluginContext.getPluginService(liveRoom.getServiceProvider());
-
-							LiveRoomMessage message = new LiveRoomMessage();
-							message.setIsIncludeSender(1);
-							message.setFromUserId(newCourseSchedule.getActualTeacherId().toString());
-							message.setToChatRoomId(liveRoom.getRoomUid());
-							message.setObjectName(LiveRoomMessage.LIVE_STATUS_CHANGE);
-
-							// 发送用户信息
-							LiveRoomMessage.MessageUser messageUser = LiveRoomMessage.MessageUser.builder()
-									.sendUserId("")
-									.sendUserName("")
-									.avatarUrl("")
-									.build();
-
-							message.setContent(LiveRoomMessage.MessageContent.builder()
-									.sendUserInfo(messageUser).build());
-
-							pluginService.sendChatRoomMessage(message);
-							log.info("liveRoom sendChatRoomMessage success, liveRoomId:{}", liveRoomId);
-						} catch (Exception e) {
-							log.error("liveRoom sendChatRoomMessage error", e);
-						}
-					})
+					try {
+						LivePluginService pluginService = livePluginContext.getPluginService(liveRoom.getServiceProvider());
+
+						LiveRoomMessage message = new LiveRoomMessage();
+						message.setIsIncludeSender(1);
+						message.setFromUserId(newCourseSchedule.getActualTeacherId().toString());
+						message.setToChatRoomId(liveRoom.getRoomUid());
+						message.setObjectName(LiveRoomMessage.LIVE_STATUS_CHANGE);
+
+						// 发送用户信息
+						LiveRoomMessage.MessageUser messageUser = LiveRoomMessage.MessageUser.builder()
+								.sendUserId("")
+								.sendUserName("")
+								.avatarUrl("")
+								.build();
+
+						message.setContent(LiveRoomMessage.MessageContent.builder()
+								.sendUserInfo(messageUser).build());
+
+						pluginService.sendChatRoomMessage(message);
+						log.info("liveRoom sendChatRoomMessage success, liveRoomId:{}", liveRoomId);
+					} catch (Exception e) {
+						log.error("liveRoom sendChatRoomMessage error", e);
+					}
+				})
 			);
 
 		}
@@ -6126,95 +6126,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
     }
 
-	@Override
-	public void checkLiveAdjust(CourseSchedule oldCourseSchedule,String startRemindTime) {
-		// 直播课
-		if (GroupType.LIVE.equals(oldCourseSchedule.getGroupType())){
-			if(org.springframework.util.StringUtils.isEmpty(startRemindTime)){
-				startRemindTime = sysConfigDao.findConfigValue("live_class_start_remind_time");
-			}
-			if(org.springframework.util.StringUtils.isEmpty(startRemindTime)){
-				startRemindTime = "30";
-			}
-			if(DateUtil.minutesBetween(new Date(),oldCourseSchedule.getStartClassTime()) < Integer.parseInt(startRemindTime)
-					&& DateUtil.minutesBetween(new Date(),oldCourseSchedule.getEndClassTime()) >= 0){
-				// TODO: 测试环境暂时注释
-				//throw new BizException("直播课课程开始前{}分钟不允许调整",startRemindTime);
-			}
-		}
-	}
-
-	@Override
-	public void checkLiveAdjust(List<CourseSchedule> courseSchedules) {
-		String startRemindTime = sysConfigDao.findConfigValue("live_class_start_remind_time");
-		courseSchedules.forEach(e->checkLiveAdjust(e,startRemindTime));
-	}
-
-	@Override
-	public void resetLiveRemind(CourseSchedule courseSchedule) {
-		if (GroupType.LIVE.equals(courseSchedule.getGroupType())) {
-			// 重置连堂课，关联直播间，消息推送状态
-			courseSchedule.setLiveRemind(0);
-			courseSchedule.setContinuousCourse(false);
-			courseSchedule.setLiveRoomId("");
-		}
-	}
-
-	@Override
-	public void resetLiveRemind(List<CourseSchedule> courseSchedules) {
-		courseSchedules.forEach(e->resetLiveRemind(e));
-	}
-
-	@Override
-	public void sendChatRoomMessage(List<CourseSchedule> courseSchedules) {
-		// 直播课消息推送
-		ExecutorService executor = Executors.newCachedThreadPool();
-		CompletableFuture.runAsync(() ->
-			courseSchedules.parallelStream().filter(e->e.getGroupType() == LIVE).forEach(item -> {
-				// 是否是连堂课
-				String continueCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME, item.getTenantId());
-				if (StringUtils.isEmpty(continueCourseTime)) {
-					continueCourseTime = "5";
-				}
-
-				// 直播课关联直播间编号
-				String liveRoomId = getCourseScheduleLiveRoomId(item, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
-
-				ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(liveRoomId);
-				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()
-							.sendUserInfo(messageUser).build());
-
-					pluginService.sendChatRoomMessage(message);
-				} catch (Exception e) {
-					log.error("liveRoom error", e);
-				}
-			}),executor
-		);
-		executor.shutdown();
-	}
-
-	@Override
+    @Override
     public List<CourseScheduleStudentDto> queryDetailList(CourseDetailQueryInfo courseDetailQueryInfo) {