diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index 7cdecefe..f56f6e2a 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -3,8 +3,10 @@ package com.peanut.modules.sociology.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.common.utils.ShiroUtils; +import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.to.ParamTo; +import com.peanut.modules.sociology.service.CourseCatalogueChapterService; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; @Slf4j @@ -21,6 +24,8 @@ import java.util.List; public class CourseController { @Autowired private CourseService courseService; + @Autowired + private CourseCatalogueChapterService courseCatalogueChapterService; /** * 获取用户最近学习课程列表 @@ -57,4 +62,26 @@ public class CourseController { return R.ok().put("courses",sociologyCourseList); } + /** + * 获取课程详情 + * @param param + * @return + */ + @RequestMapping("/getCourseDetail") + public R getCourseDetail(@RequestBody ParamTo param){ + Map courseDetail = courseService.getCourseDetail(param.getId()); + return R.ok().put("data",courseDetail); + } + + /** + * 获取课程目录章节条目列表 + * @param param + * @return + */ + @RequestMapping("/getCourseCatalogueChapterList") + public R getCourseCatalogueChapterList(@RequestBody ParamTo param){ + List courseCatalogueChapterList = courseCatalogueChapterService.getCourseCatalogueChapterList(param.getId()); + return R.ok().put("chapterList",courseCatalogueChapterList); + } + } diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseCatalogueChapterService.java b/src/main/java/com/peanut/modules/sociology/service/CourseCatalogueChapterService.java new file mode 100644 index 00000000..baf4baf6 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/CourseCatalogueChapterService.java @@ -0,0 +1,10 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; + +import java.util.List; + +public interface CourseCatalogueChapterService extends IService { + List getCourseCatalogueChapterList(int id); +} diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index adfba43b..cbc2fdce 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -6,6 +6,7 @@ import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.to.ParamTo; import java.util.List; +import java.util.Map; public interface CourseService extends IService { @@ -19,4 +20,6 @@ public interface CourseService extends IService { Page getMarketCourseList(ParamTo param); + Map getCourseDetail(Integer id); + } diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java new file mode 100644 index 00000000..f6b88500 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java @@ -0,0 +1,25 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseCatalogueChapterDao; +import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; +import com.peanut.modules.sociology.service.CourseCatalogueChapterService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service("sociologyCourseCatalogueChapterService") +public class CourseCatalogueChapterServiceImpl extends ServiceImpl implements CourseCatalogueChapterService { + + @Override + public List getCourseCatalogueChapterList(int id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CourseCatalogueChapterEntity::getCourseId,id); + wrapper.orderByAsc(CourseCatalogueChapterEntity::getSort); + List list = this.list(wrapper); + return list; + } +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index 3dcf430d..275cbd63 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -4,29 +4,32 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.modules.common.dao.CourseCatalogueDao; import com.peanut.modules.common.dao.CourseDao; import com.peanut.modules.common.dao.CourseToSociologyDao; import com.peanut.modules.common.dao.UserToCourseDao; -import com.peanut.modules.common.entity.CourseEntity; -import com.peanut.modules.common.entity.CourseToMarketEntity; -import com.peanut.modules.common.entity.CourseToSociologyEntity; -import com.peanut.modules.common.entity.UserToCourseEntity; +import com.peanut.modules.common.entity.*; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; @Slf4j @Service("sociologyCourseService") public class CourseServiceImpl extends ServiceImpl implements CourseService { @Autowired - public UserToCourseDao userToCourseDao; + private UserToCourseDao userToCourseDao; @Autowired - public CourseToSociologyDao courseToSociologyDao; + private CourseToSociologyDao courseToSociologyDao; + @Autowired + private CourseCatalogueDao courseCatalogueDao; //我的课程 @Override @@ -80,4 +83,14 @@ public class CourseServiceImpl extends ServiceImpl impl Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); return courseEntityPage; } + + @Override + public Map getCourseDetail(Integer id) { + Map flag = new HashMap<>(); + CourseEntity course = this.getById(id); + flag.put("course",course); + List courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, id)); + flag.put("catalogues",courseCatalogueEntities); + return flag; + } }