From 5ec1d66e01d82d41ba00abc946ff3e0f4bc4490f Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Fri, 7 Jul 2023 16:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=88=86=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/video/VideoController.java | 2 +- .../com/iformall/controller/PhotoSpeakVideoController.java | 2 +- .../com/iformall/controller/UserMouldVideoController.java | 2 +- .../main/java/com/iformall/controller/VideoController.java | 2 +- .../java/com/iformall/schedule/PhotoSpeakSchedule.java | 4 ++-- .../src/main/java/com/iformall/schedule/VideoSchedule.java | 2 +- .../com/iformall/service/sm/impl/MusicInfoServiceImpl.java | 2 +- .../service/sm/impl/PhotoSpeakVideoServiceImpl.java | 4 ++-- .../iformall/service/sm/impl/VoiceMaterialServiceImpl.java | 2 +- .../src/main/java/com/iformall/video/VideoExcutor.java | 2 +- .../java/com/iformall/video/aliyun/AliyunVideoExcutor.java | 7 +++++-- 11 files changed, 17 insertions(+), 14 deletions(-) diff --git a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java index 0c6beff..572c9c5 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -154,7 +154,7 @@ public class VideoController extends BaseController { @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) public ResultData videoDetial(String videoId) { try { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); return new ResultData(videoDetail); } catch (Exception e) { logger.error(e.getMessage()); diff --git a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java index 3991ec1..e2c1e0f 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -272,7 +272,7 @@ public class PhotoSpeakVideoController extends BaseController { @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) public ResultData videoDetial(String videoId) { try { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); return new ResultData(videoDetail); } catch (Exception e) { logger.error(e.getMessage()); diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java index c38750f..7dceb30 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java @@ -204,7 +204,7 @@ public class UserMouldVideoController extends BaseController { @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) public ResultData videoDetial(String videoId) { try { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); return new ResultData(videoDetail); } catch (Exception e) { logger.error(e.getMessage()); diff --git a/suimangCApi/src/main/java/com/iformall/controller/VideoController.java b/suimangCApi/src/main/java/com/iformall/controller/VideoController.java index 1bc924b..e53e066 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VideoController.java @@ -111,7 +111,7 @@ public class VideoController extends BaseController { @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) public ResultData videoDetial(String videoId) { try { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true); return new ResultData(videoDetail); } catch (Exception e) { logger.error(e.getMessage()); diff --git a/suimangSchedule/src/main/java/com/iformall/schedule/PhotoSpeakSchedule.java b/suimangSchedule/src/main/java/com/iformall/schedule/PhotoSpeakSchedule.java index 2d0d79e..d35d4d2 100644 --- a/suimangSchedule/src/main/java/com/iformall/schedule/PhotoSpeakSchedule.java +++ b/suimangSchedule/src/main/java/com/iformall/schedule/PhotoSpeakSchedule.java @@ -94,7 +94,7 @@ public class PhotoSpeakSchedule { if (videos != null && videos.size() > 0) { for (PhotoSpeakVideo video : videos) { try { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId()); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); logger.info("userVideoDetailSchedule" + videoDetail); if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) @@ -143,7 +143,7 @@ public class PhotoSpeakSchedule { if (videos != null && videos.size() > 0) { for (PhotoSpeakVideo video : videos) { try { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId()); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) && !"0.0".equals(videoDetail.getDuration())) { diff --git a/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java b/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java index 2d04f01..3c7b71f 100644 --- a/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java +++ b/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java @@ -87,7 +87,7 @@ public class VideoSchedule { if (videos != null && videos.size() > 0) { for (UserMouldVideo video : videos) { try { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId()); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) && !"0.0".equals(videoDetail.getDuration())) { diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java index 20b9829..8d14c93 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java @@ -46,7 +46,7 @@ public class MusicInfoServiceImpl implements MusicInfoService { @Override 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() && StringUtils.isNotBlank(videoDetail.getDuration()) && !"0.0".equals(videoDetail.getDuration()) diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index 20ce5e5..5735fdc 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -281,7 +281,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { 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()); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) && !"0.0".equals(videoDetail.getDuration())) { @@ -409,7 +409,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId()); Thread.sleep(1000); if (progress.equals("complete")) { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId()); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true); if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) && !"0.0".equals(videoDetail.getDuration())) { diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java index 8ea8879..31fae46 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java @@ -137,7 +137,7 @@ public class VoiceMaterialServiceImpl implements VoiceMaterialService { return; } - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVideoId()); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVideoId(),true); if (videoDetail.isSuccess()) { record.setMaterial(videoDetail.getVideoUrl()); if(record.getId() != null){ diff --git a/suimangVideo/src/main/java/com/iformall/video/VideoExcutor.java b/suimangVideo/src/main/java/com/iformall/video/VideoExcutor.java index 153dab1..8686043 100644 --- a/suimangVideo/src/main/java/com/iformall/video/VideoExcutor.java +++ b/suimangVideo/src/main/java/com/iformall/video/VideoExcutor.java @@ -23,7 +23,7 @@ public interface VideoExcutor { public String getVedioContentLength(String videoId); - VideUploadResult getVideoDetailWithCache(String videoId); + VideUploadResult getVideoDetailWithCache(String videoId,Boolean flag); VideUploadResult getVideoDetailFromApi(String videoId); diff --git a/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java b/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java index 68b0c28..c565cb0 100644 --- a/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java +++ b/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java @@ -141,8 +141,11 @@ public class AliyunVideoExcutor implements VideoExcutor { } @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){ return videoDetail; }else{