Compare commits
2 Commits
132b020763
...
b4c0be4051
| Author | SHA1 | Date | |
|---|---|---|---|
|
b4c0be4051 | ||
|
|
44b025f686 |
@ -118,32 +118,46 @@ public class AiolCourseController extends JeecgController<AiolCourse, IAiolCours
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "课程-教师端添加")
|
||||
@Operation(summary = "课程-教师端添加", description = "添加课程并关联分类，同时根据班级ID将班级学生添加到课程报名表")
|
||||
@Operation(summary = "课程-教师端添加", description = "添加课程并关联分类，同时根据班级ID将班级学生添加到课程报名表。支持多个分类ID和班级ID，用英文逗号分割")
|
||||
@RequiresPermissions("aiol:aiol_course:add")
|
||||
@PostMapping(value = "/teacher_add")
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Result<String> teacherAdd(@RequestBody AiolCourseSaveDTO dto) {
|
||||
aiolCourseService.save(dto);
|
||||
|
||||
// 处理多个分类ID
|
||||
String categoryId = dto.getCategoryId();
|
||||
if (categoryId != null && !categoryId.trim().isEmpty()) {
|
||||
String[] categoryIds = categoryId.split(",");
|
||||
for (String catId : categoryIds) {
|
||||
if (catId != null && !catId.trim().isEmpty()) {
|
||||
AiolEntityLink link = new AiolEntityLink();
|
||||
link.setSourceType("course_category");
|
||||
link.setSourceId(categoryId);
|
||||
link.setSourceId(catId.trim());
|
||||
link.setTargetType("course");
|
||||
link.setTargetId(dto.getId());
|
||||
link.setCreateBy(dto.getCreateBy());
|
||||
link.setCreateTime(new Date());
|
||||
entityLinkMapper.insert(link);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 如果提供了班级ID，将班级学生添加到课程报名表
|
||||
// 处理多个班级ID，将班级学生添加到课程报名表
|
||||
String classId = dto.getClassId();
|
||||
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 {
|
||||
// 1. 根据班级ID查询学生列表
|
||||
QueryWrapper<AiolClassStudent> studentWrapper = new QueryWrapper<>();
|
||||
studentWrapper.eq("class_id", classId);
|
||||
studentWrapper.eq("class_id", clsId.trim());
|
||||
List<AiolClassStudent> classStudents = classStudentMapper.selectList(studentWrapper);
|
||||
|
||||
if (!classStudents.isEmpty()) {
|
||||
@ -177,21 +191,27 @@ public class AiolCourseController extends JeecgController<AiolCourse, IAiolCours
|
||||
courseSignupMapper.insert(signup);
|
||||
}
|
||||
|
||||
totalNewStudents += newStudentIds.size();
|
||||
log.info("成功为课程 {} 添加班级 {} 的学生，新增报名记录 {} 条",
|
||||
dto.getId(), classId, newStudentIds.size());
|
||||
dto.getId(), clsId.trim(), newStudentIds.size());
|
||||
} else {
|
||||
log.info("班级 {} 的所有学生已报名课程 {}", classId, dto.getId());
|
||||
log.info("班级 {} 的所有学生已报名课程 {}", clsId.trim(), dto.getId());
|
||||
}
|
||||
} else {
|
||||
log.warn("班级 {} 中没有找到学生", classId);
|
||||
log.warn("班级 {} 中没有找到学生", clsId.trim());
|
||||
}
|
||||
|
||||
} 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("添加成功！");
|
||||
}
|
||||
|
||||
@ -209,22 +229,29 @@ public class AiolCourseController extends JeecgController<AiolCourse, IAiolCours
|
||||
public Result<String> edit(@RequestBody AiolCourseSaveDTO dto) {
|
||||
aiolCourseService.updateById(dto);
|
||||
|
||||
// 删除旧的分类关联
|
||||
QueryWrapper<AiolEntityLink> deleteWrapper = new QueryWrapper<>();
|
||||
deleteWrapper.eq("target_type", "course").eq("target_id", dto.getId())
|
||||
.eq("source_type", "course_category");
|
||||
entityLinkMapper.delete(deleteWrapper);
|
||||
|
||||
// 处理多个分类ID
|
||||
String categoryId = dto.getCategoryId();
|
||||
if (categoryId != null && !categoryId.trim().isEmpty()) {
|
||||
String[] categoryIds = categoryId.split(",");
|
||||
for (String catId : categoryIds) {
|
||||
if (catId != null && !catId.trim().isEmpty()) {
|
||||
AiolEntityLink link = new AiolEntityLink();
|
||||
link.setSourceType("course_category");
|
||||
link.setSourceId(categoryId);
|
||||
link.setSourceId(catId.trim());
|
||||
link.setTargetType("course");
|
||||
link.setTargetId(dto.getId());
|
||||
link.setCreateBy(dto.getUpdateBy());
|
||||
link.setCreateTime(new Date());
|
||||
entityLinkMapper.insert(link);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
@ -10,10 +10,10 @@ import org.jeecg.modules.aiol.entity.AiolCourse;
|
||||
@Schema(description = "课程保存DTO，扩展课程分类和班级")
|
||||
public class AiolCourseSaveDTO extends AiolCourse {
|
||||
|
||||
@Schema(description = "课程分类ID")
|
||||
@Schema(description = "课程分类ID，支持多个，用英文逗号分割")
|
||||
private String categoryId;
|
||||
|
||||
@Schema(description = "班级ID")
|
||||
@Schema(description = "班级ID，支持多个，用英文逗号分割")
|
||||
private String classId;
|
||||
}
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
|
||||
/**
|
||||
* @Description: 课程
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-12
|
||||
* @Date: 2025-09-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@ -121,9 +121,9 @@ public class AiolCourse implements Serializable {
|
||||
@Excel(name = "常见问题", width = 15)
|
||||
@Schema(description = "常见问题")
|
||||
private java.lang.String question;
|
||||
/**是否ai伴学模式*/
|
||||
@Excel(name = "是否ai伴学模式", width = 15)
|
||||
@Schema(description = "是否ai伴学模式")
|
||||
/**是否ai伴学模式1*/
|
||||
@Excel(name = "是否ai伴学模式1", width = 15)
|
||||
@Schema(description = "是否ai伴学模式1")
|
||||
private java.lang.Integer izAi;
|
||||
/**离开页面是否暂停视频播放*/
|
||||
@Excel(name = "离开页面是否暂停视频播放", width = 15)
|
||||
|
||||
@ -261,7 +261,7 @@ public class AiolCourseServiceImpl extends ServiceImpl<AiolCourseMapper, AiolCou
|
||||
}
|
||||
|
||||
// 只查询已上架的课程
|
||||
queryWrapper.eq("publishStatus", 1);
|
||||
queryWrapper.eq("publish_status", 1);
|
||||
|
||||
List<AiolCourse> courseList = courseMapper.selectList(queryWrapper);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user