代码合并

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

@@ -3563,27 +3563,29 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			CompletableFuture.runAsync(() ->
 
-				// 是否是连堂课
-				String continueCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME, item.getTenantId());
-				if (StringUtils.isEmpty(continueCourseTime)) {
-					continueCourseTime = "5";
-				}
+					liveCourseSchedules.parallelStream().forEach(item -> {
 
-				// 查询最新课程信息
-				CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
-				// 连堂课更新标识
-				boolean updateFlag = true;
-				// 新课时间
-				Date newCourseScheduleDate = getDateTime(newCourseSchedule.getClassDate(), newCourseSchedule.getStartClassTime()).toDate();
-				Date oldCourseScheduleDate = getDateTime(item.getClassDate(), item.getStartClassTime()).toDate();
-				if (newCourseScheduleDate.getTime() > oldCourseScheduleDate.getTime()) {
-					newCourseSchedule = item;
-					// 更新标识
-					updateFlag = false;
-				}
+						// 是否是连堂课
+						String continueCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME, item.getTenantId());
+						if (StringUtils.isEmpty(continueCourseTime)) {
+							continueCourseTime = "5";
+						}
+
+						// 查询最新课程信息
+						CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
+						// 连堂课更新标识
+						boolean updateFlag = true;
+						// 新课时间
+						Date newCourseScheduleDate = getDateTime(newCourseSchedule.getClassDate(), newCourseSchedule.getStartClassTime()).toDate();
+						Date oldCourseScheduleDate = getDateTime(item.getClassDate(), item.getStartClassTime()).toDate();
+						if (newCourseScheduleDate.getTime() > oldCourseScheduleDate.getTime()) {
+							newCourseSchedule = item;
+							// 更新标识
+							updateFlag = false;
+						}
 
-				// 直播课关联直播间编号
-				String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList(), updateFlag);
+						// 直播课关联直播间编号
+						String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList(), updateFlag);
 
 						if (StringUtils.isBlank(liveRoomId)) {
 							liveRoomId = item.getLiveRoomId();
@@ -3614,13 +3616,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							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);
-				}
-			});
-
+							pluginService.sendChatRoomMessage(message);
+							log.info("liveRoom sendChatRoomMessage success, liveRoomId:{}", liveRoomId);
+						} catch (Exception e) {
+							log.error("liveRoom sendChatRoomMessage error", e);
+						}
+					})
+			);
 		}
 
 		return BaseController.succeed();