diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index 3aed6c4e..0718c749 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java @@ -11,6 +11,7 @@ import com.xboe.core.orm.FieldFilters; import com.xboe.module.course.dto.CourseQueryDto; import com.xboe.module.course.dto.CourseTeacherDto; import com.xboe.module.course.dto.RankingDto; +import com.xboe.module.course.dto.TeacherCourseDto; import com.xboe.module.course.entity.*; import com.xboe.module.course.service.ICourseContentService; import com.xboe.module.course.service.ICourseSectionService; @@ -28,6 +29,8 @@ import com.xboe.school.study.entity.StudyHomeWork; import com.xboe.school.study.service.IStudyCourseService; import com.xboe.school.study.service.IStudyHomeWorkService; import com.xboe.school.study.service.IStudyService; +import com.xboe.system.user.entity.User; +import com.xboe.system.user.service.IUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -60,7 +63,8 @@ public class CoursePortalApi extends ApiBaseController{ @Resource private ICourseService courseService; - + @Resource + private IUserService userService; @Resource private ITeacherService teacherService; @@ -301,17 +305,30 @@ public class CoursePortalApi extends ApiBaseController{ List cclist=contentService.getByCourseId(id); List sectionlist=sectionService.getByCourseId(id); List teachers=courseService.findTeachersByCourseId(id); - + List teacherCourseDtos = new ArrayList<>(); //获取教师的介绍信息,因为一门课程 的教师不会太多,所以这里简单直接遍历查询,后续再优化 for(CourseTeacher ct : teachers) { + TeacherCourseDto teacherCourseDto = new TeacherCourseDto(); Teacher t = teacherService.get(ct.getTeacherId()); + User user = userService.get(ct.getTeacherId()); if(t!=null) { ct.setRemark(t.getDescription()); if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){ if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){ ct.setTeacherName("BOE教师"); } + teacherCourseDto.setCourseId(ct.getCourseId()); + teacherCourseDto.setTeacherName(ct.getTeacherName()); + teacherCourseDto.setTeacherId(ct.getTeacherId()); + teacherCourseDto.setCode(ct.getCode()); + teacherCourseDto.setRemark(ct.getRemark()); + teacherCourseDto.setSysCreateAid(ct.getSysCreateAid()); + teacherCourseDto.setSysCreateBy(ct.getSysCreateBy()); + teacherCourseDto.setSysCreateTime(ct.getSysCreateTime()); + teacherCourseDto.setId(ct.getId()); + teacherCourseDto.setUserNo(user.getUserNo()); + teacherCourseDtos.add(teacherCourseDto); }else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){ List list=new ArrayList<>(); list.add(ct.getTeacherId()); @@ -319,6 +336,17 @@ public class CoursePortalApi extends ApiBaseController{ if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){ ct.setTeacherName("BOE教师"); } + teacherCourseDto.setCourseId(ct.getCourseId()); + teacherCourseDto.setTeacherName(ct.getTeacherName()); + teacherCourseDto.setTeacherId(ct.getTeacherId()); + teacherCourseDto.setCode(ct.getCode()); + teacherCourseDto.setRemark(ct.getRemark()); + teacherCourseDto.setSysCreateAid(ct.getSysCreateAid()); + teacherCourseDto.setSysCreateBy(ct.getSysCreateBy()); + teacherCourseDto.setSysCreateTime(ct.getSysCreateTime()); + teacherCourseDto.setId(ct.getId()); + teacherCourseDto.setUserNo(user.getUserNo()); + teacherCourseDtos.add(teacherCourseDto); } } @@ -327,7 +355,7 @@ public class CoursePortalApi extends ApiBaseController{ rs.put("isCrowd",pass); rs.put("contents", cclist); rs.put("sections",sectionlist); - rs.put("teachers",teachers); + rs.put("teachers",teacherCourseDtos); //查询课程 return success(rs); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java new file mode 100644 index 00000000..8fef6126 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java @@ -0,0 +1,11 @@ +package com.xboe.module.course.dto; + +import com.xboe.module.course.entity.CourseTeacher; +import lombok.Data; + +import java.util.List; + +@Data +public class TeacherCourseDto extends CourseTeacher { + private String userNo; +}