|
@@ -492,6 +492,19 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //获取老师锁课缓存
|
|
|
|
+ RMap<Long, List<CourseTimeEntity>> map = getExpireLiveLockTimeCache(teacherId);
|
|
|
|
+ if (map.isExists()) {
|
|
|
|
+ List<CourseTimeEntity> courseTimeCache = map.get(teacherId);
|
|
|
|
+ //校验缓存中的时间和当前自动生成的时间有没有重复
|
|
|
|
+ checkTime = courseScheduleService.checkCourseTime(courseTimeCache, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime, autoStartDate, autoEndDate);
|
|
|
|
+ con.accept(checkTime);
|
|
|
|
+ //如果和未来时间冲突则跳过
|
|
|
|
+ if (flag.get()) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
//将自动生成时间收入集合
|
|
//将自动生成时间收入集合
|
|
CourseTimeEntity autoTimeDto = new CourseTimeEntity();
|
|
CourseTimeEntity autoTimeDto = new CourseTimeEntity();
|
|
autoTimeDto.setStartTime(autoStartDate);
|
|
autoTimeDto.setStartTime(autoStartDate);
|