From bc835f7b8d4ab951999ff7a08bf62d18daa0461e Mon Sep 17 00:00:00 2001 From: EricsHu <hrr145632> Date: 星期日, 25 六月 2023 16:59:36 +0800 Subject: [PATCH] 关闭定时器 --- src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java | 90 ++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java index 51f6744..1171cb1 100644 --- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java +++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java @@ -4,6 +4,8 @@ import java.io.File; import java.util.Date; +import com.obs.services.ObsClient; +import com.obs.services.model.ObsObject; import com.qxueyou.scc.sys.utils.VideoUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -39,8 +41,6 @@ @Autowired ICacheService cacheService; - @Value("${scc.resRootPath}") - String resRootPath; @Override public String add(String fileId, String name) { @@ -52,13 +52,13 @@ TraceUtils.setCreateTrace(resVideo); try { resVideo.setFileId(fileId); - resVideo.setPlayTime((int) VideoUtil.getMp4Duration(resRootPath +"/"+ file.getPath())); + resVideo.setPlayTime((int) VideoUtil.getMp4Duration(file.getPath())); resVideo.setName(name); resVideo.setMediaVideoId(mediaVideoId); resVideo.setStatus(ResItemVideo.STATUS_LINEUP); save(resVideo); - // 将mediaVideoId放进缓存 + // 灏唌ediaVideoId鏀捐繘缂撳瓨 cacheService.lstRightPush(RES_VIDEO_CONVER_LST, mediaVideoId); }catch (Exception e){ e.printStackTrace(); @@ -83,7 +83,7 @@ try { video.setDeleteFlag(false); - video.setPlayTime((int) VideoUtil.getMp4Duration(resRootPath +"/"+ file.getPath())); + video.setPlayTime((int) VideoUtil.getMp4Duration(file.getPath())); video.setName(file.getFileName()); video.setOrigUrl(file.getPath()); video.setStatus(MediaVideo.STATUS_LINEUP); @@ -155,45 +155,45 @@ } /** - * 定时器转码成功后 同步更新ResItemVideo的状态 + * 瀹氭椂鍣ㄨ浆鐮佹垚鍔熷悗 鍚屾鏇存柊ResItemVideo鐨勭姸鎬� */ - @Scheduled(cron = "0/2 * * * * ?") // 每2秒执行一次 - public void doTimer() { - - String mediaVideoId = cacheService.lstLeftPop(RES_VIDEO_CONVER_LST); - - if (StringUtils.isBlank(mediaVideoId)) { - return; - } - - MediaVideo mediaVideo = read(MediaVideo.class, mediaVideoId); - if (mediaVideo.getStatus() == MediaVideo.STATUS_DRAFT) { - if (mediaVideo.getType().equals("video")) { - ResItemVideo resItemVideo = findUnique( - "from ResItemVideo where deleteFlag is false and mediaVideoId = ?", - CollectionUtils.newList(mediaVideoId), ResItemVideo.class); - resItemVideo.setStatus(ResItemVideo.STATUS_DRAFT); - TraceUtils.setUpdateTrace(resItemVideo); - resItemVideo.setVideoSeconds(mediaVideo.getPlayTime()); - save(resItemVideo); - - cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemVideo.getVideoId());// 将转码完成后的文件id放入缓存。 - return; - } else if (mediaVideo.getType().equals("audio")) { - ResItemAudio resItemAudio = findUnique( - "from ResItemAudio where deleteFlag is false and mediaVideoId = ?", - CollectionUtils.newList(mediaVideoId), ResItemAudio.class); - resItemAudio.setStatus(ResItemVideo.STATUS_DRAFT); - TraceUtils.setUpdateTrace(resItemAudio); - resItemAudio.setSeconds(mediaVideo.getPlayTime()); - save(resItemAudio); - - cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemAudio.getAudioId());// 将转码完成后的文件id放入缓存。 - return; - } - - } - cacheService.lstRightPush(RES_VIDEO_CONVER_LST, mediaVideoId); - - } +// @Scheduled(cron = "0/2 * * * * ?") // 姣�2绉掓墽琛屼竴娆� +// public void doTimer() { +// +// String mediaVideoId = cacheService.lstLeftPop(RES_VIDEO_CONVER_LST); +// +// if (StringUtils.isBlank(mediaVideoId)) { +// return; +// } +// +// MediaVideo mediaVideo = read(MediaVideo.class, mediaVideoId); +// if (mediaVideo.getStatus() == MediaVideo.STATUS_DRAFT) { +// if (mediaVideo.getType().equals("video")) { +// ResItemVideo resItemVideo = findUnique( +// "from ResItemVideo where deleteFlag is false and mediaVideoId = ?", +// CollectionUtils.newList(mediaVideoId), ResItemVideo.class); +// resItemVideo.setStatus(ResItemVideo.STATUS_DRAFT); +// TraceUtils.setUpdateTrace(resItemVideo); +// resItemVideo.setVideoSeconds(mediaVideo.getPlayTime()); +// save(resItemVideo); +// +// cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemVideo.getVideoId());// 灏嗚浆鐮佸畬鎴愬悗鐨勬枃浠秈d鏀惧叆缂撳瓨銆� +// return; +// } else if (mediaVideo.getType().equals("audio")) { +// ResItemAudio resItemAudio = findUnique( +// "from ResItemAudio where deleteFlag is false and mediaVideoId = ?", +// CollectionUtils.newList(mediaVideoId), ResItemAudio.class); +// resItemAudio.setStatus(ResItemVideo.STATUS_DRAFT); +// TraceUtils.setUpdateTrace(resItemAudio); +// resItemAudio.setSeconds(mediaVideo.getPlayTime()); +// save(resItemAudio); +// +// cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemAudio.getAudioId());// 灏嗚浆鐮佸畬鎴愬悗鐨勬枃浠秈d鏀惧叆缂撳瓨銆� +// return; +// } +// +// } +// cacheService.lstRightPush(RES_VIDEO_CONVER_LST, mediaVideoId); +// +// } } -- Gitblit v1.8.0