fix 小程序试听

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonCourseController.java

@@ -17,9 +17,7 @@ import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.service.ICourseChapterSectionService;
 import com.zhongzheng.modules.course.service.ICourseMenuService;
 import com.zhongzheng.modules.course.service.ICourseModuleChapterService;
-import com.zhongzheng.modules.course.vo.CourseUserChapterSectionVo;
-import com.zhongzheng.modules.course.vo.CourseUserMenuVo;
-import com.zhongzheng.modules.course.vo.CourseUserModuleChapterVo;
+import com.zhongzheng.modules.course.vo.*;
 import com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
 import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
@@ -28,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -64,9 +63,9 @@ public class CommonCourseController extends BaseController {
 
 
     @ApiOperation("查询模块与章关系列表")
-    @GetMapping("/chapterList")
-    public AjaxResult<List<CourseUserModuleChapterVo>> chapterList(CourseMenuQueryBo bo) {
-        List<CourseUserModuleChapterVo> list = iCourseModuleChapterService.chapterList(bo);
+    @GetMapping("/chapterList/{id}")
+    public AjaxResult<List<CourseModuleChapterVo>> chapterList(@PathVariable("id" ) Long id) {
+        List<CourseModuleChapterVo> list = iCourseModuleChapterService.getListById(id);
         return AjaxResult.success(list);
     }
 
@@ -74,9 +73,9 @@ public class CommonCourseController extends BaseController {
      * 查询章与节关系列表
      */
     @ApiOperation("查询章与节关系列表+章卷同级展示")
-    @GetMapping("/sectionList")
-    public AjaxResult<List<CourseUserChapterSectionVo>> sectionList(CourseMenuQueryBo bo) {
-        List<CourseUserChapterSectionVo> list = iCourseChapterSectionService.sectionList(bo);
+    @GetMapping("/sectionList/{id}")
+    public AjaxResult<List<CourseChapterSectionVo>> sectionList(@PathVariable("id" ) Long id) {
+        List<CourseChapterSectionVo> list = iCourseChapterSectionService.getListById(id);
         return AjaxResult.success(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseChapterSectionVo.java

@@ -70,4 +70,15 @@ public class CourseChapterSectionVo {
 	@Excel(name = "1模块卷 2章卷 3试卷")
 	@ApiModelProperty("1模块卷 2章卷 3试卷")
 	private Integer type;
+
+	@Excel(name = "录播和回放的url地址")
+	@ApiModelProperty("录播和回放的url地址")
+	private String recordingUrl;
+
+	/** 直播开始时间 */
+	@ApiModelProperty("直播开始时间")
+	private Long liveStartTime;
+	/** 直播结束时间 */
+	@ApiModelProperty("直播结束时间")
+	private Long liveEndTime;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sectionType" column="section_type"/>
         <result property="publishStatus" column="publish_status"/>
         <result property="durationTime" column="duration_time"/>
+        <result property="liveStartTime" column="live_start_time"/>
+        <result property="liveEndTime" column="live_end_time"/>
+        <result property="recordingUrl" column="recording_url"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseUserChapterSectionVo" id="CourseUserChapterSectionVo">