开课课程重置，排除课程节点

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

@@ -48,6 +48,7 @@ import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static cn.hutool.core.util.ArrayUtil.join;
 import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toSet;
@@ -81,6 +82,9 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
     private ResourcesQuestionService resourcesQuestionService;
     @Autowired
     @Lazy
+    private TeacherOpenCourseService teacherOpenCourseService;
+    @Autowired
+    @Lazy
     private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
 
     //树结构缓存
@@ -469,11 +473,39 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
 
     }
 
-    public void insertByOpenCourseTitle(Long teacherOpenCourseId, String teacherOpenCourseTitle) {
+    /**
+     * 根据开课ID，和插入开课课程表，
+     * @param teacherOpenCourseId
+     */
+    public void insertMergeCourseInfoByTeacherOpenCourseId(Long teacherOpenCourseId) {
+
+        TeacherOpenCourse teacherOpenCourse = teacherOpenCourseService.getInfo(teacherOpenCourseId);
+
+        Assert.notNull(teacherOpenCourse, "开课ID为查询到对应的值！");
+
         TeacherOpenCourseMergeCourseInfo model = new TeacherOpenCourseMergeCourseInfo();
         model.setTeacherOpenCourseId(teacherOpenCourseId);
         model.setCourseInfoStatus(1);
-        model.setCourseInfoName(teacherOpenCourseTitle);
+        model.setCourseInfoType(1);
+        model.setCourseInfoContent(teacherOpenCourse.getTeacherOpenCourseSummary());
+        model.setCourseInfoName(teacherOpenCourse.getTeacherOpenCourseTitle());
+        teacherOpenCourseMergeCourseInfoService.insert(model);
+    }
+
+
+    /**
+     * 根据开课ID，和插入开课课程表，
+     * @param teacherOpenCourse
+     */
+    public void insertMergeCourseInfoByTeacherOpenCourse(@NotNull(message = "开课信息不能为空！") TeacherOpenCourse teacherOpenCourse) {
+
+        TeacherOpenCourseMergeCourseInfo model = new TeacherOpenCourseMergeCourseInfo();
+        model.setTeacherOpenCourseId(teacherOpenCourse.getTeacherOpenCourseId());
+        model.setCourseInfoStatus(1);
+        // 课程类型
+        model.setCourseInfoType(1);
+        model.setCourseInfoContent(teacherOpenCourse.getTeacherOpenCourseSummary());
+        model.setCourseInfoName(teacherOpenCourse.getTeacherOpenCourseTitle());
         teacherOpenCourseMergeCourseInfoService.insert(model);
     }
 
@@ -595,9 +627,15 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
      */
     @Override
     public void deleteByTeacherOpenCourseId(@NotNull(message = "开课ID不能为空！")  final Long teacherOpenCourseId) {
-        TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = new TeacherOpenCourseMergeCourseInfo();
-        teacherOpenCourseMergeCourseInfo.setTeacherOpenCourseId(teacherOpenCourseId);
-        deleteByCondition(teacherOpenCourseMergeCourseInfo);
+        TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery();
+        courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        // 考虑后期可能会有4的情况，暂时多加一个数字4。不查询课程节点的数据
+        courseInfoQuery.setCourseInfoTypePlural("2,3,4");
+        List<TeacherOpenCourseMergeCourseInfo> values = getValuesByQuery(courseInfoQuery);
+
+        // 根据ID删除数据
+        Set<Long> delIdList = values.stream().map(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId).collect(toSet());
+        deleteTeacherOpenCourseMergeCourseInfo(join(delIdList.toArray(), ","));
     }
 
 

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

@@ -117,7 +117,8 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
             teacherOpenCourseMergeTeacherService.insertByTeacher(teacherOpenCourseId, teacherId);
         }
 
-        teacherOpenCourseMergeCourseInfoService.insertByOpenCourseTitle(teacherOpenCourseId, teacherOpenCourseQuery.getTeacherOpenCourseTitle());
+        // 添加到开课关联的课程信息表中
+        teacherOpenCourseMergeCourseInfoService.insertMergeCourseInfoByTeacherOpenCourse(teacherOpenCourse);
         teacherOpenCourseQuery.setTeacherOpenCourseId(teacherOpenCourseId);
         JsonResult jsonResult = new JsonResult();
         jsonResult.setData(teacherOpenCourseId);//自增的ID丢进去

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

@@ -473,6 +473,7 @@ public class TeacherOpenCourseMergeCourseInfoController{
      */
     @PostMapping(API + "/deleteAllResourcesByTeacherOpenCourseId.do")
     public JsonResult deleteAllResourcesByTeacherOpenCourseId(Long teacherOpenCourseId) {
+        Assert.notNull(getUser(), "请登录后再操作");
         teacherOpenCourseMergeCourseInfoService.deleteAllResourcesByTeacherOpenCourseId(teacherOpenCourseId);
         return JsonResult.success();
     }