GoCo/OL-LearnPlatform-Backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 🎸 新增课程 多个分类班级

Browse Source
This commit is contained in:
GoCo 2025-09-13 13:54:14 +08:00
parent 132b020763
commit 44b025f686
2 changed files with 94 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolCourseController.java
View File

@ -118,32 +118,46 @@ public class AiolCourseController extends JeecgController<AiolCourse, IAiolCours
* @return * @return
*/ */
@AutoLog(value = "课程-教师端添加") @AutoLog(value = "课程-教师端添加")
@Operation(summary = "课程-教师端添加", description = "添加课程并关联分类，同时根据班级ID将班级学生添加到课程报名表") @Operation(summary = "课程-教师端添加", description = "添加课程并关联分类，同时根据班级ID将班级学生添加到课程报名表。支持多个分类ID和班级ID，用英文逗号分割")
@RequiresPermissions("aiol:aiol_course:add") @RequiresPermissions("aiol:aiol_course:add")
@PostMapping(value = "/teacher_add") @PostMapping(value = "/teacher_add")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result<String> teacherAdd(@RequestBody AiolCourseSaveDTO dto) { public Result<String> teacherAdd(@RequestBody AiolCourseSaveDTO dto) {
aiolCourseService.save(dto); aiolCourseService.save(dto);
// 处理多个分类ID
String categoryId = dto.getCategoryId(); String categoryId = dto.getCategoryId();
if (categoryId != null && !categoryId.trim().isEmpty()) { if (categoryId != null && !categoryId.trim().isEmpty()) {
String[] categoryIds = categoryId.split(",");
for (String catId : categoryIds) {
if (catId != null && !catId.trim().isEmpty()) {
AiolEntityLink link = new AiolEntityLink(); AiolEntityLink link = new AiolEntityLink();
link.setSourceType("course_category"); link.setSourceType("course_category");
link.setSourceId(categoryId); link.setSourceId(catId.trim());
link.setTargetType("course"); link.setTargetType("course");
link.setTargetId(dto.getId()); link.setTargetId(dto.getId());
link.setCreateBy(dto.getCreateBy()); link.setCreateBy(dto.getCreateBy());
link.setCreateTime(new Date()); link.setCreateTime(new Date());
entityLinkMapper.insert(link); entityLinkMapper.insert(link);
} }
}
}
// 如果提供了班级ID，将班级学生添加到课程报名表 // 处理多个班级ID，将班级学生添加到课程报名表
String classId = dto.getClassId(); String classId = dto.getClassId();
if (classId != null && !classId.trim().isEmpty()) { if (classId != null && !classId.trim().isEmpty()) {
String[] classIds = classId.split(",");
int totalNewStudents = 0;
for (String clsId : classIds) {
if (clsId == null || clsId.trim().isEmpty()) {
continue;
}
try { try {
// 1. 根据班级ID查询学生列表 // 1. 根据班级ID查询学生列表
QueryWrapper<AiolClassStudent> studentWrapper = new QueryWrapper<>(); QueryWrapper<AiolClassStudent> studentWrapper = new QueryWrapper<>();
studentWrapper.eq("class_id", classId); studentWrapper.eq("class_id", clsId.trim());
List<AiolClassStudent> classStudents = classStudentMapper.selectList(studentWrapper); List<AiolClassStudent> classStudents = classStudentMapper.selectList(studentWrapper);
if (!classStudents.isEmpty()) { if (!classStudents.isEmpty()) {
@ -177,21 +191,27 @@ public class AiolCourseController extends JeecgController<AiolCourse, IAiolCours
courseSignupMapper.insert(signup); courseSignupMapper.insert(signup);
} }
totalNewStudents += newStudentIds.size();
log.info("成功为课程 {} 添加班级 {} 的学生，新增报名记录 {} 条", log.info("成功为课程 {} 添加班级 {} 的学生，新增报名记录 {} 条",
dto.getId(), classId, newStudentIds.size()); dto.getId(), clsId.trim(), newStudentIds.size());
} else { } else {
log.info("班级 {} 的所有学生已报名课程 {}", classId, dto.getId()); log.info("班级 {} 的所有学生已报名课程 {}", clsId.trim(), dto.getId());
} }
} else { } else {
log.warn("班级 {} 中没有找到学生", classId); log.warn("班级 {} 中没有找到学生", clsId.trim());
} }
} catch (Exception e) { } catch (Exception e) {
log.error("为课程 {} 添加班级 {} 学生失败: {}", dto.getId(), classId, e.getMessage(), e); log.error("为课程 {} 添加班级 {} 学生失败: {}", dto.getId(), clsId.trim(), e.getMessage(), e);
// 不抛出异常，避免影响课程创建 // 不抛出异常，避免影响课程创建
} }
} }
if (totalNewStudents > 0) {
log.info("课程 {} 总共新增学生报名记录 {} 条", dto.getId(), totalNewStudents);
}
}
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
@ -209,22 +229,29 @@ public class AiolCourseController extends JeecgController<AiolCourse, IAiolCours
public Result<String> edit(@RequestBody AiolCourseSaveDTO dto) { public Result<String> edit(@RequestBody AiolCourseSaveDTO dto) {
aiolCourseService.updateById(dto); aiolCourseService.updateById(dto);
// 删除旧的分类关联
QueryWrapper<AiolEntityLink> deleteWrapper = new QueryWrapper<>(); QueryWrapper<AiolEntityLink> deleteWrapper = new QueryWrapper<>();
deleteWrapper.eq("target_type", "course").eq("target_id", dto.getId()) deleteWrapper.eq("target_type", "course").eq("target_id", dto.getId())
.eq("source_type", "course_category"); .eq("source_type", "course_category");
entityLinkMapper.delete(deleteWrapper); entityLinkMapper.delete(deleteWrapper);
// 处理多个分类ID
String categoryId = dto.getCategoryId(); String categoryId = dto.getCategoryId();
if (categoryId != null && !categoryId.trim().isEmpty()) { if (categoryId != null && !categoryId.trim().isEmpty()) {
String[] categoryIds = categoryId.split(",");
for (String catId : categoryIds) {
if (catId != null && !catId.trim().isEmpty()) {
AiolEntityLink link = new AiolEntityLink(); AiolEntityLink link = new AiolEntityLink();
link.setSourceType("course_category"); link.setSourceType("course_category");
link.setSourceId(categoryId); link.setSourceId(catId.trim());
link.setTargetType("course"); link.setTargetType("course");
link.setTargetId(dto.getId()); link.setTargetId(dto.getId());
link.setCreateBy(dto.getUpdateBy()); link.setCreateBy(dto.getUpdateBy());
link.setCreateTime(new Date()); link.setCreateTime(new Date());
entityLinkMapper.insert(link); entityLinkMapper.insert(link);
} }
}
}
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }

4
jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/dto/AiolCourseSaveDTO.java
View File

@ -10,10 +10,10 @@ import org.jeecg.modules.aiol.entity.AiolCourse;
@Schema(description = "课程保存DTO，扩展课程分类和班级") @Schema(description = "课程保存DTO，扩展课程分类和班级")
public class AiolCourseSaveDTO extends AiolCourse { public class AiolCourseSaveDTO extends AiolCourse {
@Schema(description = "课程分类ID") @Schema(description = "课程分类ID，支持多个，用英文逗号分割")
private String categoryId; private String categoryId;
@Schema(description = "班级ID") @Schema(description = "班级ID，支持多个，用英文逗号分割")
private String classId; private String classId;
} }