diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java index 76a50f67..394dea96 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java @@ -901,17 +901,23 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService getTreeByTeacherOpenCourseId( @NotNull(message = "开课ID不能为空!") final Long teacherOpenCourseId) { + // 查询开课下的课程章节小节等所有信息 List courseInfoList = teacherOpenCourseMergeCourseInfoDao .getByOpenCourseId(teacherOpenCourseId); - dictParser(courseInfoList); + // 有@Dict注解的时候,再开启 +// dictParser(courseInfoList); + + // 查询开课下的,资源信息 TeacherOpenCourseMergeResourcesInfoQuery resourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery(); resourcesInfoQuery.setResourcesInfoStatus(UP); resourcesInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); final List resourcesInfoList = teacherOpenCourseMergeResourcesInfoService.getValuesByQueryNotWithPermission(resourcesInfoQuery); + // 下面会有删除操作,所以用线程安全的集合 CopyOnWriteArrayList resourcesInfoCopyOnWriteArrayList = new CopyOnWriteArrayList<>(resourcesInfoList); + // 自定义树型配置 TreeNodeConfig defaultConfig = new TreeNodeConfig(); defaultConfig.setIdKey(TeacherOpenCourseMergeCourseInfoMyTree.Fields.teacherOpenCourseMergeCourseInfoId); defaultConfig.setParentIdKey(TeacherOpenCourseMergeCourseInfoMyTree.Fields.courseInfoParentId); @@ -922,6 +928,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService> build = TreeUtil.build(courseInfoList, "0", defaultConfig, ((courseInfo, treeNode) -> { Long courseInfoId = courseInfo.getTeacherOpenCourseMergeCourseInfoId(); + // 找到这个课程章节ID下,的资源 List filteredResourcesInfoList = resourcesInfoCopyOnWriteArrayList.stream() .filter(it -> it.getTeacherOpenCourseMergeCourseInfoId().equals(courseInfoId)).collect(Collectors.toList()); @@ -929,7 +936,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService courseInfoIds.contains(it.getTeacherOpenCourseMergeCourseInfoId().toString())); //对key进行映射赋值