From b58b29d3a9a3b7bb897cb912f80f7c7debf9c9a0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 14 Feb 2023 16:34:53 +0800 Subject: [PATCH] //vodeo --- .../main/java/com/iformall/schedule/VideoSchedule.java | 5 ++--- .../java/com/iformall/mapper/UserMouldVideoMapper.java | 2 +- .../com/iformall/service/sm/UserMouldVideoService.java | 2 +- .../service/sm/impl/UserMouldVideoServiceImpl.java | 4 ++-- .../src/main/resources/mapper/UserMouldVideoMapper.xml | 4 ++-- .../com/iformall/video/aliyun/AliyunVideoExcutor.java | 10 +++++++--- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java b/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java index b828cfa..d84d26e 100644 --- a/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java +++ b/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java @@ -53,13 +53,12 @@ public class VideoSchedule { */ @Scheduled(cron = "15 */30 * * * *?") // 每小时检查一次 public void couponVideoDetailSchedule() { - List videos = userMouldVideoService.getVideoTimeNullList(); + List videos = userMouldVideoService.getVideoSizeNullList(); if (videos != null && videos.size() > 0) { for (UserMouldVideo video : videos) { try { VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId()); - if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) - && !"0.0".equals(videoDetail.getDuration())) { + if (videoDetail.isSuccess()) { video.setVideoTime(videoDetail.getDuration()); video.setVideoSize(videoDetail.getSize()); userMouldVideoService.updateById(video); diff --git a/suimangService/src/main/java/com/iformall/mapper/UserMouldVideoMapper.java b/suimangService/src/main/java/com/iformall/mapper/UserMouldVideoMapper.java index 7082f1f..2cabee1 100644 --- a/suimangService/src/main/java/com/iformall/mapper/UserMouldVideoMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/UserMouldVideoMapper.java @@ -23,5 +23,5 @@ public interface UserMouldVideoMapper extends CommonMapper List getVideoIdNullList(); - List getVideoTimeNullList(); + List getVideoSizeNullList(); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java b/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java index 5f1e782..9d9e99e 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java @@ -50,7 +50,7 @@ public interface UserMouldVideoService { List getVideoIdNullList(); - List getVideoTimeNullList(); + List getVideoSizeNullList(); int updateById(UserMouldVideo video); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 900fbaf..d95ad96 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -149,8 +149,8 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { } @Override - public List getVideoTimeNullList() { - return userMouldVideoMapper.getVideoTimeNullList(); + public List getVideoSizeNullList() { + return userMouldVideoMapper.getVideoSizeNullList(); } @Override diff --git a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml index c58276c..531e8f4 100644 --- a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml @@ -131,12 +131,12 @@ and (video_id is null or video_id == '') - select id,video_id from user_mould_video where `is_del` = 0 and video_id is not null and video_path != '' - and (video_time is null or video_time == '') + and video_size is null 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 5b5eea1..9771997 100644 --- a/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java +++ b/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java @@ -37,6 +37,8 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class AliyunVideoExcutor implements VideoExcutor { + private String videoStatus = "Normal";//正常的视频状态 + @Autowired AliyunVideoConfig config; @@ -142,10 +144,11 @@ public class AliyunVideoExcutor implements VideoExcutor { return videoDetail; }else{ VideUploadResult result = getVideoDetailFromApi(videoId); - if(StringUtils.isNotBlank(result.getCoverURL()) - && StringUtils.isNotBlank(result.getDuration()) - && !"0.0".equals(result.getDuration())){ + if(this.videoStatus.equals(result.getStatus())){ UploadCacheHelper.cacheVideoDetail(redisTemplate, videoId,result); + }else{ + //还不能播放 + result.setSuccess(false); } return result; } @@ -162,6 +165,7 @@ public class AliyunVideoExcutor implements VideoExcutor { List playInfoList = response.getPlayInfoList(); //播放地址 for (GetPlayInfoResponse.PlayInfo playInfo : playInfoList) { + result.setStatus(playInfo.getStatus()); result.setVideoUrl(playInfo.getPlayURL()); result.setHeight(playInfo.getHeight()); result.setWidth(playInfo.getWidth());