换个电脑敲

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java

@@ -9,6 +9,8 @@ import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.NotNull;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +35,19 @@ public interface TeacherOpenCourseMergeCourseInfoDao extends BaseMapper<TeacherO
     List<TeacherOpenCourseMergeCourseInfo> getValuesByQuery(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
     List<TeacherOpenCourseMergeCourseInfo> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
     List<Map<String,Object>>getExcelValues(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
+
+    /**
+     * 通过开课ID获取开课课程信息
+     * 包含他自己本身
+     *
+     * @param teacherOpenCourseId
+     * @return
+     */
+    default Collection<TeacherOpenCourseMergeCourseInfo> getValueByTeacherOpenCourseId(@NotNull(message = "开课ID不能为空") Long teacherOpenCourseId) {
+        return createLambdaQuery()
+                .andEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseId, teacherOpenCourseId)
+                .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId, null)
+                .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1)
+                .select();
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java

@@ -12,7 +12,7 @@ import java.util.List;
 * 开课- 课程配置-离线
 * gen by Spring Boot2 Admin 2022-10-26
 */
-public class TeacherOpenCourseMergeCourseInfo extends BaseEntity{
+public class TeacherOpenCourseMergeCourseInfo extends BaseEntity {
 
     //ID
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfoTree.java

@@ -0,0 +1,100 @@
+package com.ibeetl.jlw.entity;
+
+import com.ibeetl.admin.core.annotation.Dict;
+import lombok.Data;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.Table;
+import org.beetl.sql.fetch.annotation.Fetch;
+import org.beetl.sql.fetch.annotation.FetchSql;
+
+import java.util.List;
+
+/**
+ * 开课- 课程配置-离线
+ * Tree结构数据
+ *
+ * @author mlx
+ */
+@Data
+@Table(name = "teacher_open_course_merge_course_info")
+@Fetch(level = 5)
+public class TeacherOpenCourseMergeCourseInfoTree {
+
+    //ID
+    @AutoID
+    private Long teacherOpenCourseMergeCourseInfoId ;
+
+    //开课ID
+    @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
+
+    private Long teacherOpenCourseId ;
+
+    //名称（课程名 或 章名 或 节名）
+
+    private String courseInfoName ;
+
+    //课程缩略图
+
+    private String courseInfoThumbnail ;
+
+    //课程标签ID
+    @Dict(type="course_label.course_label_name.course_label_status=1")
+
+    private Long courseLabelId ;
+
+    //课程学习人数基数
+
+    private Integer courseInfoBasicsCount ;
+
+    //课程简介
+
+    private String courseInfoContent ;
+
+    //状态(1启用 2禁用 3删除)
+
+    private Integer courseInfoStatus ;
+
+    //类型(1课程 2章 3节)
+
+    private Integer courseInfoType ;
+
+    //父节点ID
+
+    private Long courseInfoParentId ;
+
+    //视频ID(resources_info_id，和节对应)
+
+    private Long courseVideoId ;
+
+    //课件ID(resources_info_id，和节对应)
+
+    private Long courseCoursewareId ;
+
+    //附件IDs(resources_info_id，和节对应)
+
+    private String courseEnclosureIds ;
+
+    //客观题IDs（和章对应）
+
+    private String resourcesQuestionIds ;
+
+    //竞赛题IDs（和章对应）
+
+    private String resourcesCompetitionIds ;
+
+    //实训题IDs（和章对应）
+
+    private String resourcesTrainingIds ;
+
+    //组织机构ID
+
+    private Long orgId ;
+
+    //后台用户ID
+
+    private Long userId ;
+
+    @FetchSql("select * from teacher_open_course_merge_course_info t where t.course_info_parent_id = #teacherOpenCourseMergeCourseInfoId# ")
+    private List<TeacherOpenCourseMergeCourseInfoTree> children;
+
+}

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java

@@ -518,23 +518,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
     }
 
     public TeacherOpenCourseMergeCourseInfo getTreeById(Long teacherOpenCourseMergeCourseInfoId){
-        TeacherOpenCourseMergeCourseInfo courseInfo = null;
-        if(null != TreeCache.get(teacherOpenCourseMergeCourseInfoId)){
-            courseInfo = ToolUtils.deepCopy(TreeCache.get(teacherOpenCourseMergeCourseInfoId));
-        } else {
-            courseInfo = teacherOpenCourseMergeCourseInfoDao.getById(teacherOpenCourseMergeCourseInfoId);
-            if(null != courseInfo){
-                courseInfo.set("id",courseInfo.getTeacherOpenCourseMergeCourseInfoId());
-                courseInfo.set("title",courseInfo.getCourseInfoName());
-                courseInfo.set("spread","true");
-                if(null == courseInfo.getCourseInfoType()){
-                    courseInfo.setCourseInfoType(1);
-                }
-                getByParentCourseInfoId(courseInfo, courseInfo.getTeacherOpenCourseMergeCourseInfoId(),1);
-            }
-            TreeCache.put(courseInfo.getTeacherOpenCourseMergeCourseInfoId(),ToolUtils.deepCopy(courseInfo));
-        }
-        return courseInfo;
+
+        return null;
     }
 
 

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java

@@ -472,10 +472,15 @@ public class TeacherOpenCourseMergeCourseInfoController{
         return JsonResult.success();
     }
 
-    //树结构
+    /**
+     * 树结构查询开课课程信息
+     *
+     * @param teacherOpenCourseId       开课ID
+     * @return
+     */
     @GetMapping(MODEL + "/getTreeById.json")
-    public JsonResult getTreeById(Long courseInfoId) {
-        return  JsonResult.success(teacherOpenCourseMergeCourseInfoService.getTreeById(courseInfoId));
+    public JsonResult getTreeById(Long teacherOpenCourseId) {
+        return  JsonResult.success(teacherOpenCourseMergeCourseInfoService.getTreeById(teacherOpenCourseId));
     }
 
 }