From 14a77868cde8155de722eaa4287fc5331e1d5fa0 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 22 Jul 2024 09:14:28 +0800 Subject: [PATCH] =?UTF-8?q?vod=E6=99=AE=E9=80=9A=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/peanut/common/utils/SpdbUtil.java | 10 +++++++--- .../master/controller/CourseController.java | 17 +++++++++++++++++ .../CourseCatalogueChapterVideoServiceImpl.java | 15 ++++++++++----- .../sociology/controller/CourseController.java | 4 ++-- .../sys/controller/VodAliController.java | 4 +++- src/main/resources/application.yml | 2 +- 6 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/peanut/common/utils/SpdbUtil.java b/src/main/java/com/peanut/common/utils/SpdbUtil.java index b015e66e..b5592d24 100644 --- a/src/main/java/com/peanut/common/utils/SpdbUtil.java +++ b/src/main/java/com/peanut/common/utils/SpdbUtil.java @@ -28,7 +28,7 @@ import java.util.Map; public class SpdbUtil { @Autowired - private static VideoM3u8Dao videoM3u8Dao; + private VideoM3u8Dao videoM3u8Dao; private static Client client; static { @@ -161,8 +161,12 @@ public class SpdbUtil { } - public static void vodTranslationM3u8(String vid) throws Exception { - List videoM3u8Entities = videoM3u8Dao.selectList(new LambdaQueryWrapper().eq(VideoM3u8Entity::getVid, vid)); + public void vodTranslationM3u8(String vid) throws Exception { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(VideoM3u8Entity::getVid,vid); + + + List videoM3u8Entities = videoM3u8Dao.selectList(wrapper); if(videoM3u8Entities.size()>0){ return; } diff --git a/src/main/java/com/peanut/modules/master/controller/CourseController.java b/src/main/java/com/peanut/modules/master/controller/CourseController.java index 028cb619..895bfeeb 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -40,6 +40,8 @@ public class CourseController { private ShopProductService shopProductService; @Autowired private VideoM3u8Dao videoM3u8Dao; + @Autowired + private SpdbUtil spdbUtil; @RequestMapping("/getCourseList") @@ -78,6 +80,21 @@ public class CourseController { return R.ok(); } + @RequestMapping("/cossVod") + public R cossVod(@RequestBody Map map) throws Exception { + int p = map.get("page"); + int l = map.get("limit"); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CourseCatalogueChapterVideoEntity::getType,1); + Page courseCatalogueChapterVideoEntityPage = courseCatalogueChapterVideoService.getBaseMapper().selectPage(new Page<>(p, l), wrapper); + for (CourseCatalogueChapterVideoEntity c :courseCatalogueChapterVideoEntityPage.getRecords()){ + spdbUtil.vodTranslationM3u8(c.getVideo()); + } + return R.ok(); + } + + + @RequestMapping("/getCoursedetail") public R getCoursedetail(@RequestBody ParamTo param){ CourseEntity course = courseService.getById(param.getId()); diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java index fce7f165..2330a2cd 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java @@ -47,6 +47,8 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl().eq(VideoM3u8Entity::getVid, video.getVideo())); + if(integer>0){ + String s = playToken.generateToken(); + GetPlayInfoResponseBody urlBody = SpdbUtil.getUrl(video.getVideo()); + String url = urlBody==null?null:urlBody.getPlayInfoList().getPlayInfo().get(0).getPlayURL()+"?MtsHlsUriToken="+s; + video.setMtsHlsUriToken(s); + video.setM3u8Url(url); + } } UserCourseVideoPositionEntity videoPosition = getVideoPosition(video, uId); video.setUserCourseVideoPositionEntity(videoPosition); diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index 0a6e24c7..3fd89ecf 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -221,8 +221,8 @@ public class CourseController { @RequestMapping("/mytt2") public R mytt2(@RequestBody Map map){ GetPlayInfoResponseBody urlbody = SpdbUtil.getUrl(map.get("vid")); - String url = urlbody==null?null:urlbody.getPlayInfoList().getPlayInfo().get(0).getPlayURL(); - return R.ok().put("result",url); +// String url = urlbody==null?null:urlbody.getPlayInfoList().getPlayInfo().get(0).getPlayURL(); + return R.ok().put("result",urlbody); } diff --git a/src/main/java/com/peanut/modules/sys/controller/VodAliController.java b/src/main/java/com/peanut/modules/sys/controller/VodAliController.java index 951e59ce..c856127d 100644 --- a/src/main/java/com/peanut/modules/sys/controller/VodAliController.java +++ b/src/main/java/com/peanut/modules/sys/controller/VodAliController.java @@ -16,6 +16,8 @@ import java.util.Map; public class VodAliController { @Autowired private PlayToken playToken; + @Autowired + private SpdbUtil spdbUtil; @GetMapping("/vodAliVideoRe") public byte[] vodAliVideoRe(@RequestParam("CipherText") String cipherText, @@ -41,7 +43,7 @@ public class VodAliController { @PostMapping("/uploadCallback") public void uploadCallback(@RequestBody Map map) throws Exception { String vid = String.valueOf(map.get("VideoId")); - SpdbUtil.vodTranslationM3u8(vid); + spdbUtil.vodTranslationM3u8(vid); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 558f513f..78c2dc0a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ connection-timeout: 6000000ms spring: # 环境 dev/dev1|test|prod profiles: - active: prod + active: dev1 # jackson时间格式化 jackson: time-zone: GMT+8