|
@@ -212,12 +212,18 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
|
|
|
if (lessonCoursewareDetail == null) {
|
|
|
throw new BizException("课件未找到");
|
|
|
}
|
|
|
+ CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware =
|
|
|
+ coursewareFeignService.lessonCoursewareDetail(lessonCoursewareDetail.getLessonCoursewareId()).feignData();
|
|
|
+ if (lessonCourseware == null) {
|
|
|
+ throw new BizException("课件未找到");
|
|
|
+ }
|
|
|
Teacher teacher = teacherDao.get(query.getTeacherId());
|
|
|
if (teacher == null) {
|
|
|
throw new BizException("老师信息不存在");
|
|
|
}
|
|
|
if (lessonCoursewareDetail.getLevel() == null || teacher.getCoursewareFlag()) {
|
|
|
- return new ArrayList<>();
|
|
|
+ result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
|
|
|
+ return result;
|
|
|
}
|
|
|
LessonCoursewareWrapper.LessonCoursewareQuery query1 = new LessonCoursewareWrapper.LessonCoursewareQuery();
|
|
|
query1.setPage(1);
|
|
@@ -226,14 +232,10 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
|
|
|
query1.setEnable(true);
|
|
|
List<LessonCoursewareWrapper.LessonCoursewareDto> dtos = baseMapper.list(query1);
|
|
|
if(CollectionUtils.isEmpty(dtos)){
|
|
|
- return new ArrayList<>();
|
|
|
+ result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
|
|
|
+ return result;
|
|
|
}
|
|
|
List<Long> lessonCoursewareIds = dtos.stream().map(LessonCoursewareWrapper.LessonCoursewareDto::getLessonCoursewareId).collect(Collectors.toList());
|
|
|
- CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware =
|
|
|
- coursewareFeignService.lessonCoursewareDetail(lessonCoursewareDetail.getLessonCoursewareId()).feignData();
|
|
|
- if (lessonCourseware == null) {
|
|
|
- throw new BizException("课件未找到");
|
|
|
- }
|
|
|
// 查询当前能使用的课件
|
|
|
CbsLessonCoursewareWrapper.LessonCoursewareQuery lambdaQuery = new CbsLessonCoursewareWrapper.LessonCoursewareQuery();
|
|
|
lambdaQuery.setPage(1);
|
|
@@ -242,7 +244,8 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
|
|
|
lambdaQuery.setLessonCoursewareIds(lessonCoursewareIds);
|
|
|
List<CbsLessonCoursewareWrapper.LessonCourseware> lessonCoursewareList = coursewareFeignService.lessonCoursewarePage(lambdaQuery).feignData().getRows();
|
|
|
if (CollectionUtils.isEmpty(lessonCoursewareList)) {
|
|
|
- return new ArrayList<>();
|
|
|
+ result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
|
|
|
+ return result;
|
|
|
}
|
|
|
List<Long> courseIds = lessonCoursewareList.stream().map(CbsLessonCoursewareWrapper.LessonCourseware::getId).collect(Collectors.toList());
|
|
|
Map<Long, CbsLessonCoursewareWrapper.LessonCourseware> lessonCoursewareMap =
|
|
@@ -256,7 +259,8 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
|
|
|
lessonCoursewareDetailQuery.setLevel(lessonCoursewareDetail.getLevel());
|
|
|
List<CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail> lessonCoursewareDetails = coursewareFeignService.lessonCoursewareDetailPage(lessonCoursewareDetailQuery).feignData().getRows();
|
|
|
if (CollectionUtils.isEmpty(lessonCoursewareDetails)) {
|
|
|
- return new ArrayList<>();
|
|
|
+ result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
|
|
|
+ return result;
|
|
|
}
|
|
|
for (CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail coursewareDetail : lessonCoursewareDetails) {
|
|
|
LessonCoursewareWrapper.RefLevelDetailInfo refLevelDetailInfo = new LessonCoursewareWrapper.RefLevelDetailInfo();
|
|
@@ -276,6 +280,19 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ private LessonCoursewareWrapper.RefLevelDetailInfo initRefLevelDetailInfo(CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail coursewareDetail,
|
|
|
+ CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware) {
|
|
|
+ LessonCoursewareWrapper.RefLevelDetailInfo refLevelDetailInfo = new LessonCoursewareWrapper.RefLevelDetailInfo();
|
|
|
+ refLevelDetailInfo.setId(coursewareDetail.getId());
|
|
|
+ refLevelDetailInfo.setLessonCoursewareId(coursewareDetail.getLessonCoursewareId());
|
|
|
+ refLevelDetailInfo.setCoverImg(lessonCourseware.getCoverImg());
|
|
|
+ refLevelDetailInfo.setCourseTypeCode(lessonCourseware.getCourseTypeCode());
|
|
|
+ refLevelDetailInfo.setLockFlag(false);
|
|
|
+ refLevelDetailInfo.setLessonCoursewareName(lessonCourseware.getName());
|
|
|
+ refLevelDetailInfo.setUseFlag(true);
|
|
|
+ return refLevelDetailInfo;
|
|
|
+ }
|
|
|
+
|
|
|
//递归处理CbsLessonCoursewareDetailWrapper.KnowledgePointSmall
|
|
|
private void setTreeResourceId(List<CbsLessonCoursewareDetailWrapper.KnowledgePointSmall> knowledgePointList,List<Integer> categoryIdList){
|
|
|
if(CollectionUtils.isNotEmpty(knowledgePointList)){
|