|
@@ -15,6 +15,7 @@ package vip.xiaonuo.disk.controller;
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollStreamUtil;
|
|
import cn.hutool.core.collection.CollStreamUtil;
|
|
|
|
|
+import cn.hutool.core.util.IdUtil;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
|
|
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
|
|
@@ -30,22 +31,25 @@ import vip.xiaonuo.common.annotation.CommonLog;
|
|
|
import vip.xiaonuo.common.pojo.CommonResult;
|
|
import vip.xiaonuo.common.pojo.CommonResult;
|
|
|
import vip.xiaonuo.common.pojo.CommonValidList;
|
|
import vip.xiaonuo.common.pojo.CommonValidList;
|
|
|
import vip.xiaonuo.disk.domain.Chapter;
|
|
import vip.xiaonuo.disk.domain.Chapter;
|
|
|
-import vip.xiaonuo.disk.domain.CourseInfo;
|
|
|
|
|
|
|
+import vip.xiaonuo.disk.domain.CourseChapterKnowledge;
|
|
|
import vip.xiaonuo.disk.domain.CourseRelate;
|
|
import vip.xiaonuo.disk.domain.CourseRelate;
|
|
|
-import vip.xiaonuo.disk.domain.ResourceRecordUserRelate;
|
|
|
|
|
import vip.xiaonuo.disk.param.ChapterAddParam;
|
|
import vip.xiaonuo.disk.param.ChapterAddParam;
|
|
|
import vip.xiaonuo.disk.param.ChapterEditParam;
|
|
import vip.xiaonuo.disk.param.ChapterEditParam;
|
|
|
import vip.xiaonuo.disk.param.ChapterIdParam;
|
|
import vip.xiaonuo.disk.param.ChapterIdParam;
|
|
|
import vip.xiaonuo.disk.param.ChapterPageParam;
|
|
import vip.xiaonuo.disk.param.ChapterPageParam;
|
|
|
import vip.xiaonuo.disk.service.ChapterService;
|
|
import vip.xiaonuo.disk.service.ChapterService;
|
|
|
import vip.xiaonuo.disk.service.ClassHourService;
|
|
import vip.xiaonuo.disk.service.ClassHourService;
|
|
|
|
|
+import vip.xiaonuo.disk.service.CourseChapterKnowledgeService;
|
|
|
import vip.xiaonuo.disk.service.CourseRelateService;
|
|
import vip.xiaonuo.disk.service.CourseRelateService;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
import javax.validation.constraints.NotEmpty;
|
|
import javax.validation.constraints.NotEmpty;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -67,6 +71,10 @@ public class CourseChapterController {
|
|
|
@Resource
|
|
@Resource
|
|
|
private CourseRelateService courseRelateService;
|
|
private CourseRelateService courseRelateService;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private CourseChapterKnowledgeService courseChapterKnowledgeService;
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 课程章节表-分页列表
|
|
* 课程章节表-分页列表
|
|
|
*
|
|
*
|
|
@@ -238,6 +246,18 @@ public class CourseChapterController {
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
courseRelateService.addBatch(courseRelates);
|
|
courseRelateService.addBatch(courseRelates);
|
|
|
}
|
|
}
|
|
|
|
|
+ //添加章节,设计知识点关联表
|
|
|
|
|
+ List<CourseChapterKnowledge> list=new ArrayList<>();
|
|
|
|
|
+ chapterAddParam.getKnowledgeIds().stream().forEach(knowledgeId -> {
|
|
|
|
|
+
|
|
|
|
|
+ CourseChapterKnowledge courseChapterKnowledge = new CourseChapterKnowledge();
|
|
|
|
|
+ courseChapterKnowledge.setCourseId(chapterAddParam.getCourseId());
|
|
|
|
|
+ courseChapterKnowledge.setChapterId(chapter.getId());
|
|
|
|
|
+ courseChapterKnowledge.setKnowledgeId(knowledgeId);
|
|
|
|
|
+ courseChapterKnowledge.setId(IdUtil.getSnowflake().nextIdStr());
|
|
|
|
|
+ list.add(courseChapterKnowledge);
|
|
|
|
|
+ });
|
|
|
|
|
+ courseChapterKnowledgeService.saveBatch(list);
|
|
|
return CommonResult.ok();
|
|
return CommonResult.ok();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -274,6 +294,27 @@ public class CourseChapterController {
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
courseRelateService.addBatch(courseRelates);
|
|
courseRelateService.addBatch(courseRelates);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ //根据章节id和课程id删除关联表
|
|
|
|
|
+ Map<String, Object> knowledgeParam = new HashMap<>();
|
|
|
|
|
+ knowledgeParam.put("COURSE_ID", chapterEditParam.getCourseId());
|
|
|
|
|
+ knowledgeParam.put("CHAPTER_ID", chapter.getId());
|
|
|
|
|
+ courseChapterKnowledgeService.removeByMap(knowledgeParam);
|
|
|
|
|
+
|
|
|
|
|
+ //添加章节,设计知识点关联表
|
|
|
|
|
+ List<CourseChapterKnowledge> list=new ArrayList<>();
|
|
|
|
|
+ chapterEditParam.getKnowledgeIds().stream().forEach(knowledgeId -> {
|
|
|
|
|
+
|
|
|
|
|
+ CourseChapterKnowledge courseChapterKnowledge = new CourseChapterKnowledge();
|
|
|
|
|
+ courseChapterKnowledge.setCourseId(chapterEditParam.getCourseId());
|
|
|
|
|
+ courseChapterKnowledge.setChapterId(chapter.getId());
|
|
|
|
|
+ courseChapterKnowledge.setKnowledgeId(knowledgeId);
|
|
|
|
|
+ courseChapterKnowledge.setId(IdUtil.getSnowflake().nextIdStr());
|
|
|
|
|
+ list.add(courseChapterKnowledge);
|
|
|
|
|
+ });
|
|
|
|
|
+ courseChapterKnowledgeService.saveBatch(list);
|
|
|
|
|
+
|
|
|
return CommonResult.ok();
|
|
return CommonResult.ok();
|
|
|
}
|
|
}
|
|
|
|
|
|