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 02b27b68..34d1e825 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 @@ -13,10 +13,7 @@ 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; -import com.xboe.module.course.service.ICourseService; -import com.xboe.module.course.service.ICourseTeacherService; +import com.xboe.module.course.service.*; import com.xboe.module.course.vo.CourseStudyVo; import com.xboe.module.course.vo.TeacherVo; import com.xboe.module.teacher.entity.Teacher; @@ -33,6 +30,7 @@ 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; @@ -97,6 +95,8 @@ public class CoursePortalApi extends ApiBaseController{ @Autowired StringRedisTemplate redisTemplate; + @Resource + private ICourseTagService courseTagService; /** * 根据多个课程id返回对应的课程的图片.返回结果如下, @@ -261,7 +261,14 @@ public class CoursePortalApi extends ApiBaseController{ if(course==null || course.getDeleted()){ return badRequest("课程不存在或已被删除"); } - rs.put("course",course); + Course course1 = new Course(); + BeanUtils.copyProperties(course,course1); + if (StringUtils.isNotBlank(course.getTags()) && course.getTags().matches("[0-9,]+")) { + List tagList = courseTagService.getTagsByIds(course.getTags()); + String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(",")); + course1.setTags(tags); + } + rs.put("course",course1); List courseCrowdList = courseService.findCrowdByCourseId(id); if(crowd!=null && crowd) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index feb21711..19d145a4 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -893,11 +893,6 @@ public class CourseServiceImpl implements ICourseService { public Course getAddView(String id) { Course c = courseDao.get(id); courseDao.updateFieldById(id, "views", c.getViews() + 1); - if (StringUtils.isNotBlank(c.getTags()) && c.getTags().matches("[0-9,]+")) { - List tagList = courseTagService.getTagsByIds(c.getTags()); - String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(",")); - c.setTags(tags); - } return c; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 92adc0d2..33429e75 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -14,12 +14,15 @@ import com.boe.feign.api.infrastructure.entity.CommonSearchVo; import com.boe.feign.api.infrastructure.entity.Dict; import com.xboe.api.ThirdApi; import com.xboe.constants.CacheName; +import com.xboe.module.course.entity.*; +import com.xboe.module.course.service.ICourseTagService; import com.xboe.module.course.vo.TeacherVo; import com.xboe.module.usergroup.service.IUserGroupService; import com.xboe.school.study.dao.StudyCourseDao; import com.xboe.school.vo.StudyTimeVo; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.GetMapping; @@ -36,11 +39,6 @@ import com.xboe.common.utils.StringUtil; import com.xboe.core.CurrentUser; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; -import com.xboe.module.course.entity.Course; -import com.xboe.module.course.entity.CourseContent; -import com.xboe.module.course.entity.CourseCrowd; -import com.xboe.module.course.entity.CourseSection; -import com.xboe.module.course.entity.CourseTeacher; import com.xboe.module.course.service.ICourseContentService; import com.xboe.module.course.service.ICourseSectionService; import com.xboe.module.course.service.ICourseService; @@ -102,6 +100,8 @@ public class StudyCourseApi extends ApiBaseController{ @Autowired StringRedisTemplate redisTemplate; + @Resource + private ICourseTagService courseTagService; /** * 用于查询课程的学习记录 @@ -169,7 +169,14 @@ public class StudyCourseApi extends ApiBaseController{ if(course==null || course.getDeleted()){ return badRequest("课程不存在或已被删除"); } - rs.put("course",course); + Course course1 = new Course(); + BeanUtils.copyProperties(course,course1); + if (StringUtils.isNotBlank(course.getTags()) && course.getTags().matches("[0-9,]+")) { + List tagList = courseTagService.getTagsByIds(course.getTags()); + String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(",")); + course1.setTags(tags); + } + rs.put("course",course1); List courseCrowdList = courseService.findCrowdByCourseId(cid); if(crowd!=null && crowd) {