|
@@ -337,6 +337,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
String courseScheduleName = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));
|
|
|
|
|
|
+ System.out.println("***************开始循环***************");
|
|
|
while (highClassGroup.getCourseTimes() >= times) {
|
|
|
int dayOfWeek = now.getDayOfWeek().getValue();
|
|
|
if (highClassGroup.getDayOfWeek() == dayOfWeek) {
|
|
@@ -366,15 +367,20 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
now = now.plusDays(1);
|
|
|
}
|
|
|
+ System.out.println("***************结束循环***************");
|
|
|
//检测新排课冲突
|
|
|
- //courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
|
|
|
- //courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
|
|
|
+ courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
|
|
|
+ System.out.println("***************检查排课***************");
|
|
|
+ courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
|
|
|
+ System.out.println("***************批量排课***************");
|
|
|
|
|
|
List<Integer> userIdList = new ArrayList<>();
|
|
|
userIdList.add(classGroupTeacherMapper.getUserId());
|
|
|
|
|
|
//加入Im群组
|
|
|
addImGroup(highClassGroup, userIdList);
|
|
|
+
|
|
|
+ System.out.println("***************融云加群***************");
|
|
|
}
|
|
|
redisCache.releaseLocked(key, value);
|
|
|
return highClassGroupList;
|