Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoMapper.java

@@ -269,7 +269,7 @@ public interface FsUserCourseVideoMapper extends BaseMapper<FsUserCourseVideo> {
     @Select("select * from fs_user_course_video where line_two is not null and job_id is null")
     List<FsUserCourseVideo> selectVideoByHuaWei();
 
-    @Select("select * from fs_user_course_video where job_id is not null and vid is null")
+    @Select("select * from fs_user_course_video where job_id is not null and  (vid is null or vid='')")
     List<FsUserCourseVideo> selectVideoByJobId();
 
     @Select("select * from fs_user_course_video where vid is not null")

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -4296,6 +4296,9 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                 System.out.println(resp.getResponseMetadata().getError());
                 System.exit(-1);
             }else {
+                if (StringUtils.isEmpty(resp.getResult().getData().getMediaInfoList(0).getVid())){
+                    return;
+                }
                 FsUserCourseVideo video = new FsUserCourseVideo();
                 video.setVideoId(courseVideo.getVideoId());
                 video.setVid(resp.getResult().getData().getMediaInfoList(0).getVid());