|
|
@@ -264,8 +264,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { |
|
|
|
@Async |
|
|
|
@Override |
|
|
|
public void uploadVideo(PhotoSpeakVideo mouldVideo){ |
|
|
|
if(EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoStatus()) |
|
|
|
|| EnumVideoStatus.upload_fail.getCode().equals(mouldVideo.getVideoStatus())){ |
|
|
|
if(EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoStatus())){ |
|
|
|
String url1 = url + mouldVideo.getVideoPath(); |
|
|
|
VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url1); |
|
|
|
if(result.isSuccess()){ |
|
|
@@ -273,40 +272,38 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { |
|
|
|
videoUpd.setId(mouldVideo.getId()); |
|
|
|
videoUpd.setVideoId(result.getVideoId()); |
|
|
|
videoUpd.setVideoStatus(EnumVideoStatus.upload_ing.getCode()); |
|
|
|
videoUpd.setUpdateDate(new Date()); |
|
|
|
this.saveOrUpdate(videoUpd); |
|
|
|
|
|
|
|
AtomicInteger integer = new AtomicInteger(30); |
|
|
|
while (true){ |
|
|
|
PhotoSpeakVideo videoUrlUpd = new PhotoSpeakVideo(); |
|
|
|
videoUrlUpd.setId(mouldVideo.getId()); |
|
|
|
for (int i = 0;i <= 30; i++){ |
|
|
|
try { |
|
|
|
String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); |
|
|
|
Thread.sleep(1000); |
|
|
|
if (StringUtils.isNotEmpty(progress) && progress.equals("complete")) { |
|
|
|
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); |
|
|
|
if (videoDetail.isSuccess() |
|
|
|
&& StringUtils.isNotBlank(videoDetail.getDuration()) |
|
|
|
&& !"0.0".equals(videoDetail.getDuration())) { |
|
|
|
mouldVideo.setCoverImg(videoDetail.getCoverURL()); |
|
|
|
mouldVideo.setVideoPlayUrl(videoDetail.getVideoUrl()); |
|
|
|
mouldVideo.setVideoTime(videoDetail.getDuration()); |
|
|
|
mouldVideo.setVideoSize(videoDetail.getSize()); |
|
|
|
mouldVideo.setVideoStatus(EnumVideoStatus.upload_success.getCode()); |
|
|
|
this.updateById(mouldVideo); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (integer.getAndDecrement() <= 0){ |
|
|
|
mouldVideo.setVideoStatus(EnumVideoStatus.fail.getCode()); |
|
|
|
mouldVideo.setVideoMsg("视频上传失败,点击“编辑”重试"); |
|
|
|
this.updateById(mouldVideo); |
|
|
|
break; |
|
|
|
} |
|
|
|
Thread.sleep(2000); |
|
|
|
} catch (InterruptedException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
mouldVideo.setVideoStatus(EnumVideoStatus.fail.getCode()); |
|
|
|
mouldVideo.setVideoMsg("视频上传失败,点击“编辑”重试"); |
|
|
|
this.updateById(mouldVideo); |
|
|
|
} |
|
|
|
String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); |
|
|
|
if (progress.equals("complete")) { |
|
|
|
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); |
|
|
|
if (videoDetail.isSuccess()){ |
|
|
|
videoUrlUpd.setCoverImg(videoDetail.getCoverURL()); |
|
|
|
videoUrlUpd.setVideoPlayUrl(videoDetail.getVideoUrl()); |
|
|
|
videoUrlUpd.setVideoTime(videoDetail.getDuration()); |
|
|
|
videoUrlUpd.setVideoSize(videoDetail.getSize()); |
|
|
|
videoUrlUpd.setVideoStatus(EnumVideoStatus.upload_success.getCode()); |
|
|
|
videoUrlUpd.setVideoMsg("视频上传成功"); |
|
|
|
videoUrlUpd.setUpdateDate(new Date()); |
|
|
|
this.updateById(videoUrlUpd); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(videoUrlUpd.getVideoStatus() == null){ |
|
|
|
videoUrlUpd.setVideoStatus(EnumVideoStatus.upload_fail.getCode()); |
|
|
|
videoUrlUpd.setVideoMsg("视频上传超时"); |
|
|
|
videoUrlUpd.setUpdateDate(new Date()); |
|
|
|
this.updateById(videoUrlUpd); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@@ -392,8 +389,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { |
|
|
|
@Async |
|
|
|
@Override |
|
|
|
public void uploadHyVideo(PhotoSpeakVideo mouldVideo){ |
|
|
|
if(EnumVideoStatus.hy_success.getCode().equals(mouldVideo.getVideoStatus()) |
|
|
|
|| EnumVideoStatus.hy_upload_fail.getCode().equals(mouldVideo.getVideoStatus())){ |
|
|
|
if(EnumVideoStatus.hy_success.getCode().equals(mouldVideo.getVideoStatus())){ |
|
|
|
String url = hy_url + mouldVideo.getVideoPath(); |
|
|
|
VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url); |
|
|
|
if(result.isSuccess()){ |
|
|
@@ -401,42 +397,38 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { |
|
|
|
videoUpd.setId(mouldVideo.getId()); |
|
|
|
videoUpd.setVideoId(result.getVideoId()); |
|
|
|
videoUpd.setVideoStatus(EnumVideoStatus.hy_upload_ing.getCode()); |
|
|
|
videoUpd.setUpdateDate(new Date()); |
|
|
|
this.saveOrUpdate(videoUpd); |
|
|
|
|
|
|
|
AtomicInteger integer = new AtomicInteger(30); |
|
|
|
while (true){ |
|
|
|
PhotoSpeakVideo videoUrlUpd = new PhotoSpeakVideo(); |
|
|
|
videoUrlUpd.setId(mouldVideo.getId()); |
|
|
|
for (int i = 0;i <= 30; i++){ |
|
|
|
try { |
|
|
|
String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); |
|
|
|
Thread.sleep(1000); |
|
|
|
if (progress.equals("complete")) { |
|
|
|
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); |
|
|
|
if (videoDetail.isSuccess() |
|
|
|
&& StringUtils.isNotBlank(videoDetail.getDuration()) |
|
|
|
&& !"0.0".equals(videoDetail.getDuration())) { |
|
|
|
mouldVideo.setCoverImg(videoDetail.getCoverURL()); |
|
|
|
mouldVideo.setVideoPlayUrl(videoDetail.getVideoUrl()); |
|
|
|
mouldVideo.setVideoTime(videoDetail.getDuration()); |
|
|
|
mouldVideo.setVideoSize(videoDetail.getSize()); |
|
|
|
mouldVideo.setVideoStatus(EnumVideoStatus.hy_upload_success.getCode()); |
|
|
|
this.updateById(mouldVideo); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (integer.getAndDecrement() <= 0){ |
|
|
|
mouldVideo.setVideoStatus(EnumVideoStatus.hy_fail.getCode()); |
|
|
|
mouldVideo.setIsHy(EnumYesOrNo.NO.getCode()); |
|
|
|
mouldVideo.setVideoMsg("视频上传失败,点击“编辑”重试"); |
|
|
|
this.updateById(mouldVideo); |
|
|
|
break; |
|
|
|
} |
|
|
|
Thread.sleep(2000); |
|
|
|
} catch (InterruptedException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
mouldVideo.setVideoStatus(EnumVideoStatus.hy_fail.getCode()); |
|
|
|
mouldVideo.setIsHy(EnumYesOrNo.NO.getCode()); |
|
|
|
mouldVideo.setVideoMsg("视频上传失败,点击“编辑”重试"); |
|
|
|
this.updateById(mouldVideo); |
|
|
|
} |
|
|
|
String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); |
|
|
|
if (progress.equals("complete")) { |
|
|
|
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); |
|
|
|
if (videoDetail.isSuccess()){ |
|
|
|
videoUrlUpd.setCoverImg(videoDetail.getCoverURL()); |
|
|
|
videoUrlUpd.setVideoPlayUrl(videoDetail.getVideoUrl()); |
|
|
|
videoUrlUpd.setVideoTime(videoDetail.getDuration()); |
|
|
|
videoUrlUpd.setVideoSize(videoDetail.getSize()); |
|
|
|
videoUrlUpd.setVideoStatus(EnumVideoStatus.hy_upload_success.getCode()); |
|
|
|
videoUrlUpd.setVideoMsg("视频上传成功"); |
|
|
|
videoUrlUpd.setUpdateDate(new Date()); |
|
|
|
this.updateById(videoUrlUpd); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(videoUrlUpd.getVideoStatus() == null){ |
|
|
|
videoUrlUpd.setVideoStatus(EnumVideoStatus.hy_upload_fail.getCode()); |
|
|
|
videoUrlUpd.setVideoMsg("视频上传超时"); |
|
|
|
videoUrlUpd.setUpdateDate(new Date()); |
|
|
|
this.updateById(videoUrlUpd); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|