|
@@ -2450,9 +2450,16 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
|
|
|
FsUserCourseVideo fsUserCourseVideo = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
|
|
FsUserCourseVideo fsUserCourseVideo = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
|
|
|
FsUserCourseVideoDetailsVO fsUserCourseVideoDetailsVO = new FsUserCourseVideoDetailsVO();
|
|
FsUserCourseVideoDetailsVO fsUserCourseVideoDetailsVO = new FsUserCourseVideoDetailsVO();
|
|
|
BeanUtils.copyProperties(fsUserCourseVideo, fsUserCourseVideoDetailsVO);
|
|
BeanUtils.copyProperties(fsUserCourseVideo, fsUserCourseVideoDetailsVO);
|
|
|
-
|
|
|
|
|
|
|
+ //从配置中读取默认线路
|
|
|
|
|
+ String json = configService.selectConfigByKey("course.config");
|
|
|
|
|
+ CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
|
|
|
|
|
+ if (Integer.valueOf(1).equals(config.getDefaultLine())) {
|
|
|
|
|
+ fsUserCourseVideoDetailsVO.setVideoUrl(fsUserCourseVideo.getLineTwo());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ fsUserCourseVideoDetailsVO.setVideoUrl(fsUserCourseVideo.getLineOne());
|
|
|
|
|
+ }
|
|
|
//这里 改成取线路一值,返回给前端。VideoUrl 是原视频(用来算流量的),不要去改,lineOne是转码后的视频
|
|
//这里 改成取线路一值,返回给前端。VideoUrl 是原视频(用来算流量的),不要去改,lineOne是转码后的视频
|
|
|
- fsUserCourseVideoDetailsVO.setVideoUrl(fsUserCourseVideo.getLineOne());
|
|
|
|
|
|
|
+// fsUserCourseVideoDetailsVO.setVideoUrl(fsUserCourseVideo.getLineOne());
|
|
|
|
|
|
|
|
// 获取课程相关的题库
|
|
// 获取课程相关的题库
|
|
|
String questionBankId = fsUserCourseVideo.getQuestionBankId();
|
|
String questionBankId = fsUserCourseVideo.getQuestionBankId();
|