Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

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<String, Object> courseDetail = courseService.getCourseDetail(param.getId());
+        return R.ok().put("data",courseDetail);
+    }
+
+    /**
+     * 获取课程目录章节条目列表
+     * @param param
+     * @return
+     */
+    @RequestMapping("/getCourseCatalogueChapterList")
+    public R getCourseCatalogueChapterList(@RequestBody ParamTo param){
+        List<CourseCatalogueChapterEntity> courseCatalogueChapterList = courseCatalogueChapterService.getCourseCatalogueChapterList(param.getId());
+        return R.ok().put("chapterList",courseCatalogueChapterList);
+    }
+
 }

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<CourseCatalogueChapterEntity> {
+    List<CourseCatalogueChapterEntity> getCourseCatalogueChapterList(int id);
+}

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<CourseEntity> {
 
@@ -19,4 +20,6 @@ public interface CourseService extends IService<CourseEntity> {
 
     Page<CourseEntity> getMarketCourseList(ParamTo param);
 
+    Map<String, Object> getCourseDetail(Integer id);
+
 }

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<CourseCatalogueChapterDao, CourseCatalogueChapterEntity> implements CourseCatalogueChapterService {
+
+    @Override
+    public List<CourseCatalogueChapterEntity> getCourseCatalogueChapterList(int id) {
+        LambdaQueryWrapper<CourseCatalogueChapterEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CourseCatalogueChapterEntity::getCourseId,id);
+        wrapper.orderByAsc(CourseCatalogueChapterEntity::getSort);
+        List<CourseCatalogueChapterEntity> list = this.list(wrapper);
+        return list;
+    }
+}

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<CourseDao, CourseEntity> 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<CourseDao, CourseEntity> impl
         Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
         return courseEntityPage;
     }
+
+    @Override
+    public Map<String, Object> getCourseDetail(Integer id) {
+        Map<String, Object> flag = new HashMap<>();
+        CourseEntity course = this.getById(id);
+        flag.put("course",course);
+        List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, id));
+        flag.put("catalogues",courseCatalogueEntities);
+        return flag;
+    }
 }