From 0748cf8a86dbca291115dc1c0532593c594e2601 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 22 Dec 2022 15:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseMergeCourseInfoService.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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<Tea
     public Tree<String> getTreeByTeacherOpenCourseId(
             @NotNull(message = "开课ID不能为空！") final Long teacherOpenCourseId) {
 
+        // 查询开课下的课程章节小节等所有信息
         List<TeacherOpenCourseMergeCourseInfoMyTree> courseInfoList = teacherOpenCourseMergeCourseInfoDao
                 .getByOpenCourseId(teacherOpenCourseId);
-        dictParser(courseInfoList);
 
+        // 有@Dict注解的时候，再开启
+//        dictParser(courseInfoList);
+
+        // 查询开课下的，资源信息
         TeacherOpenCourseMergeResourcesInfoQuery resourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery();
         resourcesInfoQuery.setResourcesInfoStatus(UP);
         resourcesInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
         final List<TeacherOpenCourseMergeResourcesInfo> resourcesInfoList = teacherOpenCourseMergeResourcesInfoService.getValuesByQueryNotWithPermission(resourcesInfoQuery);
 
+        // 下面会有删除操作，所以用线程安全的集合
         CopyOnWriteArrayList<TeacherOpenCourseMergeResourcesInfo> 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<Tea
         List<Tree<String>> build = TreeUtil.build(courseInfoList, "0", defaultConfig, ((courseInfo, treeNode) -> {
             Long courseInfoId = courseInfo.getTeacherOpenCourseMergeCourseInfoId();
 
+            // 找到这个课程章节ID下，的资源
             List<TeacherOpenCourseMergeResourcesInfo> filteredResourcesInfoList = resourcesInfoCopyOnWriteArrayList.stream()
                     .filter(it -> it.getTeacherOpenCourseMergeCourseInfoId().equals(courseInfoId)).collect(Collectors.toList());
 
@@ -929,7 +936,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
             String courseInfoIds = filteredResourcesInfoList.stream().map(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeCourseInfoId)
                     .map(Objects::toString)
                     .collect(Collectors.joining(","));
-            // 删除临时变量
+            // 删除临时变量中的资源，提升下次查找的速度
             resourcesInfoCopyOnWriteArrayList.removeIf(it -> courseInfoIds.contains(it.getTeacherOpenCourseMergeCourseInfoId().toString()));
 
             //对key进行映射赋值