diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java index c4c4a8d6..ae79ff6c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java @@ -490,25 +490,27 @@ public class CourseAuditApi extends ApiBaseController{ .aiSet(course.getAiSet()) .languageStatus(course.getLanguageStatus()) .build() ; - for (CourseContent cc : cclist) { - //筛选视频资源 - if(cc.getContentType() == 10 ){ - JSONObject json = JSONObject.parseObject(cc.getContent()); - if(json == null || json.getString("url") == null) { - continue; + if(cclist != null && !cclist.isEmpty()){ + for (CourseContent cc : cclist) { + //筛选视频资源 + if(cc.getContentType() == 10 ){ + JSONObject json = JSONObject.parseObject(cc.getContent()); + if(json == null || json.getString("url") == null) { + continue; + } + String videoUrl = json.getString("url"); + //String videoUrlPerfix = "https://u-pre.boe.com/upload"; //测试 + //String videoUrlPerfix = "https://u.boe.com/upload"; //生产 + String videoType = videoUrl.substring(videoUrl.lastIndexOf(".")+1); + videoList.add(BoeaiVideoResourceDto.builder() + .courseId(cc.getCourseId()) + .videoId(cc.getId()) + .title(cc.getContentName()) + .originalUrl(videoUrlPerfix+videoUrl) + .duration(cc.getDuration()) + .format(videoType) + .build()); } - String videoUrl = json.getString("url"); - //String videoUrlPerfix = "https://u-pre.boe.com/upload"; //测试 - //String videoUrlPerfix = "https://u.boe.com/upload"; //生产 - String videoType = videoUrl.substring(videoUrl.lastIndexOf(".")+1); - videoList.add(BoeaiVideoResourceDto.builder() - .courseId(cc.getCourseId()) - .videoId(cc.getId()) - .title(cc.getContentName()) - .originalUrl(videoUrlPerfix+videoUrl) - .duration(cc.getDuration()) - .format(videoType) - .build()); } } boeaiCourseDto.setBoeaiVideoResourceReqList(videoList); 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 80ca42a3..4216d3ba 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 @@ -462,7 +462,7 @@ public class CourseServiceImpl implements ICourseService { rs.setCount(listByFilters2.size()); rs.setPageSize(pageSize); rs.setList(paginate); - if (!paginate.isEmpty()) { + if (paginate != null && !paginate.isEmpty()) { log.info("-----KJB------ getCourse"); for (Course course : paginate) { this.getCourseFromKJB(course); 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 94b5c547..20453be1 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 @@ -217,9 +217,11 @@ public class StudyCourseApi extends ApiBaseController{ List sectionlist=sectionService.getByCourseId(cid); List teachers=courseService.findTeachersByCourseId(cid); - for (CourseContent cc : cclist) { - log.info("根据视频信息查询AI字幕数据:cc = " + cc.toString()); - this.getVtt( cid , cc); + if(cclist!=null && !cclist.isEmpty()){ + for (CourseContent cc : cclist) { + log.info("根据视频信息查询AI字幕数据:cc = " + cc.toString()); + this.getVtt( cid , cc); + } } //获取教师的介绍信息,因为一门课程 的教师不会太多,所以这里简单直接遍历查询,后续再优化