| @@ -154,7 +154,7 @@ public class VideoController extends BaseController { | |||||
| @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | ||||
| public ResultData videoDetial(String videoId) { | public ResultData videoDetial(String videoId) { | ||||
| try { | try { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); | |||||
| return new ResultData(videoDetail); | return new ResultData(videoDetail); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| @@ -272,7 +272,7 @@ public class PhotoSpeakVideoController extends BaseController { | |||||
| @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | ||||
| public ResultData videoDetial(String videoId) { | public ResultData videoDetial(String videoId) { | ||||
| try { | try { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); | |||||
| return new ResultData(videoDetail); | return new ResultData(videoDetail); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| @@ -204,7 +204,7 @@ public class UserMouldVideoController extends BaseController { | |||||
| @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | ||||
| public ResultData videoDetial(String videoId) { | public ResultData videoDetial(String videoId) { | ||||
| try { | try { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); | |||||
| return new ResultData(videoDetail); | return new ResultData(videoDetail); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| @@ -111,7 +111,7 @@ public class VideoController extends BaseController { | |||||
| @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) | ||||
| public ResultData videoDetial(String videoId) { | public ResultData videoDetial(String videoId) { | ||||
| try { | try { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); | |||||
| return new ResultData(videoDetail); | return new ResultData(videoDetail); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| @@ -94,7 +94,7 @@ public class PhotoSpeakSchedule { | |||||
| if (videos != null && videos.size() > 0) { | if (videos != null && videos.size() > 0) { | ||||
| for (PhotoSpeakVideo video : videos) { | for (PhotoSpeakVideo video : videos) { | ||||
| try { | try { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId()); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); | |||||
| logger.info("userVideoDetailSchedule" + videoDetail); | logger.info("userVideoDetailSchedule" + videoDetail); | ||||
| if (videoDetail.isSuccess() | if (videoDetail.isSuccess() | ||||
| && StringUtils.isNotBlank(videoDetail.getDuration()) | && StringUtils.isNotBlank(videoDetail.getDuration()) | ||||
| @@ -143,7 +143,7 @@ public class PhotoSpeakSchedule { | |||||
| if (videos != null && videos.size() > 0) { | if (videos != null && videos.size() > 0) { | ||||
| for (PhotoSpeakVideo video : videos) { | for (PhotoSpeakVideo video : videos) { | ||||
| try { | try { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId()); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); | |||||
| if (videoDetail.isSuccess() | if (videoDetail.isSuccess() | ||||
| && StringUtils.isNotBlank(videoDetail.getDuration()) | && StringUtils.isNotBlank(videoDetail.getDuration()) | ||||
| && !"0.0".equals(videoDetail.getDuration())) { | && !"0.0".equals(videoDetail.getDuration())) { | ||||
| @@ -87,7 +87,7 @@ public class VideoSchedule { | |||||
| if (videos != null && videos.size() > 0) { | if (videos != null && videos.size() > 0) { | ||||
| for (UserMouldVideo video : videos) { | for (UserMouldVideo video : videos) { | ||||
| try { | try { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId()); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); | |||||
| if (videoDetail.isSuccess() | if (videoDetail.isSuccess() | ||||
| && StringUtils.isNotBlank(videoDetail.getDuration()) | && StringUtils.isNotBlank(videoDetail.getDuration()) | ||||
| && !"0.0".equals(videoDetail.getDuration())) { | && !"0.0".equals(videoDetail.getDuration())) { | ||||
| @@ -46,7 +46,7 @@ public class MusicInfoServiceImpl implements MusicInfoService { | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(MusicInfo record) { | public ResultData saveOrUpdate(MusicInfo record) { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVoiceId()); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVoiceId(),true); | |||||
| if (videoDetail.isSuccess() | if (videoDetail.isSuccess() | ||||
| && StringUtils.isNotBlank(videoDetail.getDuration()) | && StringUtils.isNotBlank(videoDetail.getDuration()) | ||||
| && !"0.0".equals(videoDetail.getDuration()) | && !"0.0".equals(videoDetail.getDuration()) | ||||
| @@ -281,7 +281,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { | |||||
| String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); | String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); | ||||
| Thread.sleep(1000); | Thread.sleep(1000); | ||||
| if (StringUtils.isNotEmpty(progress) && progress.equals("complete")) { | if (StringUtils.isNotEmpty(progress) && progress.equals("complete")) { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId()); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); | |||||
| if (videoDetail.isSuccess() | if (videoDetail.isSuccess() | ||||
| && StringUtils.isNotBlank(videoDetail.getDuration()) | && StringUtils.isNotBlank(videoDetail.getDuration()) | ||||
| && !"0.0".equals(videoDetail.getDuration())) { | && !"0.0".equals(videoDetail.getDuration())) { | ||||
| @@ -409,7 +409,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { | |||||
| String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); | String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); | ||||
| Thread.sleep(1000); | Thread.sleep(1000); | ||||
| if (progress.equals("complete")) { | if (progress.equals("complete")) { | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId()); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); | |||||
| if (videoDetail.isSuccess() | if (videoDetail.isSuccess() | ||||
| && StringUtils.isNotBlank(videoDetail.getDuration()) | && StringUtils.isNotBlank(videoDetail.getDuration()) | ||||
| && !"0.0".equals(videoDetail.getDuration())) { | && !"0.0".equals(videoDetail.getDuration())) { | ||||
| @@ -137,7 +137,7 @@ public class VoiceMaterialServiceImpl implements VoiceMaterialService { | |||||
| return; | return; | ||||
| } | } | ||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVideoId()); | |||||
| VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVideoId(),true); | |||||
| if (videoDetail.isSuccess()) { | if (videoDetail.isSuccess()) { | ||||
| record.setMaterial(videoDetail.getVideoUrl()); | record.setMaterial(videoDetail.getVideoUrl()); | ||||
| if(record.getId() != null){ | if(record.getId() != null){ | ||||
| @@ -23,7 +23,7 @@ public interface VideoExcutor { | |||||
| public String getVedioContentLength(String videoId); | public String getVedioContentLength(String videoId); | ||||
| VideUploadResult getVideoDetailWithCache(String videoId); | |||||
| VideUploadResult getVideoDetailWithCache(String videoId,Boolean flag); | |||||
| VideUploadResult getVideoDetailFromApi(String videoId); | VideUploadResult getVideoDetailFromApi(String videoId); | ||||
| @@ -141,8 +141,11 @@ public class AliyunVideoExcutor implements VideoExcutor { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public VideUploadResult getVideoDetailWithCache(String videoId) { | |||||
| VideUploadResult videoDetail = UploadCacheHelper.getVideoDetail(redisTemplate, videoId); | |||||
| public VideUploadResult getVideoDetailWithCache(String videoId,Boolean flag) { | |||||
| VideUploadResult videoDetail = null; | |||||
| if (flag){ | |||||
| videoDetail = UploadCacheHelper.getVideoDetail(redisTemplate, videoId); | |||||
| } | |||||
| if(videoDetail != null){ | if(videoDetail != null){ | ||||
| return videoDetail; | return videoDetail; | ||||
| }else{ | }else{ | ||||