zyp

fs-service/src/main/java/com/fs/course/mapper/FsVideoResourceMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.course.domain.FsVideoResource;
 import com.fs.course.vo.FsVideoResourceVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -17,4 +18,10 @@ public interface FsVideoResourceMapper extends BaseMapper<FsVideoResource> {
      * @return  list
      */
     List<FsVideoResourceVO> selectVideoResourceListByMap(@Param("params") Map<String, Object> params);
+
+    @Select("select * from fs_video_resource where line1 is not null and is_transcode = 0 and is_del = 0")
+    List<FsVideoResource> selectVideoNotTranscode();
+
+    @Select("select * from fs_video_resource where is_transcode = 1 and is_del = 0 and transcode_file_key is null")
+    List<FsVideoResource> selectVideoIsTranscode();
 }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -410,7 +410,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         if (log==null){
             createWatchLog(param);
         }
-        return R.ok();
+        return R.ok().put("qwExternalId",matchedContact.getId());
     }
 
     private void createWatchLog(FsUserCourseVideoAddKfUParam param) {

fs-service/src/main/java/com/fs/course/service/impl/TencentCloudCosService.java

@@ -3,7 +3,9 @@ package com.fs.course.service.impl;
 import com.fs.common.core.domain.R;
 import com.fs.config.tencent.TencentProperties;
 import com.fs.course.domain.FsUserCourseVideo;
+import com.fs.course.domain.FsVideoResource;
 import com.fs.course.mapper.FsUserCourseVideoMapper;
+import com.fs.course.mapper.FsVideoResourceMapper;
 import com.fs.course.service.ITencentCloudCosService;
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.exception.CosClientException;
@@ -162,14 +164,14 @@ public class TencentCloudCosService implements ITencentCloudCosService {
     public R updateUrl() {
         try {
             //查出已转码的视频并且没有文件key的
-            List<FsUserCourseVideo> videos =  courseVideoMapper.selectVideoIsTranscode();
-            for (FsUserCourseVideo video : videos ){
-                String newUrl = replaceCourse(video.getLineOne());
-                FsUserCourseVideo videoMap = new FsUserCourseVideo();
-                videoMap.setVideoId(video.getVideoId());
-                videoMap.setLineOne(newUrl);
+            List<FsVideoResource> videos =  videoResourceMapper.selectVideoIsTranscode();
+            for (FsVideoResource video : videos ){
+                String newUrl = replaceCourse(video.getLine1());
+                FsVideoResource videoMap = new FsVideoResource();
+                videoMap.setId(video.getId());
+                videoMap.setLine1(newUrl);
                 videoMap.setTranscodeFileKey(replaceCourse(video.getFileKey()));
-                courseVideoMapper.updateFsUserCourseVideo(videoMap);
+                videoResourceMapper.updateById(videoMap);
             }
             return R.ok();
         }catch (Exception e){
@@ -209,6 +211,9 @@ public class TencentCloudCosService implements ITencentCloudCosService {
     @Autowired
     private FsUserCourseVideoMapper courseVideoMapper;
 
+    @Autowired
+    private FsVideoResourceMapper videoResourceMapper;
+
     /**
      * 批量转码
      * @return
@@ -216,15 +221,15 @@ public class TencentCloudCosService implements ITencentCloudCosService {
     @Override
     public R videoTranscode() {
         //查出未转码的视频
-        List<FsUserCourseVideo> videos =  courseVideoMapper.selectVideoTranscode(0);
-        for (FsUserCourseVideo video : videos ){
+        List<FsVideoResource> videos =  videoResourceMapper.selectVideoNotTranscode();
+        for (FsVideoResource video : videos ){
             String inputPath = "/"+video.getFileKey();
             String outputPath = "/"+replaceCourse(video.getFileKey());
             submitTranscodeJob(inputPath,outputPath);
-            FsUserCourseVideo videoMap = new FsUserCourseVideo();
-            videoMap.setVideoId(video.getVideoId());
+            FsVideoResource videoMap = new FsVideoResource();
+            videoMap.setId(video.getId());
             videoMap.setIsTranscode(1);
-            courseVideoMapper.updateFsUserCourseVideo(videoMap);
+            videoResourceMapper.updateById(videoMap);
         }
 
         return R.ok();