Explorar o código

Merge remote-tracking branch 'origin/test' into test

syh %!s(int64=5) %!d(string=hai) anos
pai
achega
631891bd5f

+ 0 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialImageInfoServiceImpl.java

@@ -39,8 +39,6 @@ public class MaterialImageInfoServiceImpl extends ServiceImpl<MaterialImageInfoM
     @Value("${oss.replace.download}")
     private String downloadUrl;
 
-
-
     @Autowired
     private MaterialImageInfoMapper materialImageInfoMapper;
 

+ 11 - 40
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -64,10 +64,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     @Resource
     private IMaterialCutFrameService materialCutFrameService;
 
-    @Value("${oss.replace.replace-value}")
-    private String replaceValue;
-    @Value("${oss.replace.replace-old-value}")
-    private String replaceOldValue;
+
     @Value("${oss.replace.download}")
     private String downloadUrl;
 
@@ -77,33 +74,34 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         MaterialInfo materialInfo = this.getById(materialId);
         String path = materialInfo.getUrl().substring(materialInfo.getUrl().indexOf("/", 10) + 1, materialInfo.getUrl().length());
         String taskId = videoWatermarkHandle(path, tentcentWatermarkTemplate.getTemplateId());
-        DescribeTaskDetailResponse taskDetailResponse=null;
-        for(int i=0;i<10;i++){
+        DescribeTaskDetailResponse taskDetailResponse = null;
+        for (int i = 0; i < 10; i++) {
             try {
                 Thread.sleep(2000);
             } catch (InterruptedException e) {
                 log.error(e.getMessage());
             }
             taskDetailResponse = getTaskDetailResponse(taskId);
-            if(taskDetailResponse.getStatus().equals("FINISH")){
+            if (taskDetailResponse.getStatus().equals("FINISH")) {
                 break;
             }
         }
-        if(taskDetailResponse.getStatus().equals("FINISH")){
-            String videoUrl=taskDetailResponse.getWorkflowTask().getMediaProcessResultSet()[0].getTranscodeTask().getOutput().getPath();
+        if (taskDetailResponse.getStatus().equals("FINISH")) {
+            String videoUrl = taskDetailResponse.getWorkflowTask().getMediaProcessResultSet()[0].getTranscodeTask().getOutput().getPath();
             VideoWatermarkTask videoWatermarkTask = new VideoWatermarkTask();
-            videoWatermarkTask.setVideoUrl(CosConstant.COS_MEDIA_URL_PREFIX+videoUrl);
+            videoWatermarkTask.setVideoUrl(CosConstant.COS_MEDIA_URL_PREFIX + videoUrl);
             videoWatermarkTask.setVideoId(materialId);
             videoWatermarkTask.setJobId(taskId);
             videoWatermarkTask.setUserId(userId);
             videoWatermarkTask.setStatus(taskDetailResponse.getStatus());
             videoWatermarkTaskService.save(videoWatermarkTask);
-            materialInfo.setWatermarkUrl(CosConstant.COS_MEDIA_URL_PREFIX+videoUrl);
+            materialInfo.setWatermarkUrl(CosConstant.COS_MEDIA_URL_PREFIX + videoUrl);
             materialInfo.setWatermarkCode(taskId);
             this.updateById(materialInfo);
         }
 
     }
+
     @Override
     public MaterialInfo getMaterialInfoByCodeAndProjectId(String code, Long projectId) {
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
@@ -336,22 +334,18 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         uploadExecutorService.submit(new Runnable() {
             @Override
             public void run() {
-                /*try {*/
                 log.info("获取素材基本信息,code:{}", materialInfo.getCode());
                 if (!Check.isNull(materialInfo)) {
                     long l = System.currentTimeMillis();
-                    String videoUrl = materialInfo.getUrl();
-                    String url = videoUrl.replace(replaceOldValue, replaceValue);
+                    String url = materialInfo.getUrl();
                     log.info("replaceUrl:{}", url);
                     String localUrl = null;
                     it.sauronsoftware.jave.MultimediaInfo m = null;
                     FileInputStream fis = null;
                     try {
                         localUrl = LoadFileUtil.downLoadFromUrl(url, downloadUrl);
-
                         File file = new File(localUrl);
                         it.sauronsoftware.jave.Encoder encoder = new Encoder();
-                        /*try {*/
                         m = encoder.getInfo(file);
                         long duration = m.getDuration();
                         long secondDuration = duration / 1000;
@@ -383,18 +377,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                         if (insert > 0) {
                             log.info("素材基本信息入库完成,用时:{} s", (System.currentTimeMillis() - l) / 1000);
                         }
-                        Thread thread = new Thread() {
-                            @Override
-                            public void run() {
-                                try {
-                                    log.info("开始抽帧");
-                                    materialCutFrameService.getCutFrame(videoUrl, materialInfo.getCode(), secondDuration, height, width);
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        };
-                        thread.start();
                     } catch (FileNotFoundException e) {
                         e.printStackTrace();
                     } catch (IOException e) {
@@ -411,18 +393,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                             e.printStackTrace();
                         }
                     }
-
-                    /* */
-
-                       /* } catch (Exception e) {
-                            e.printStackTrace();
-                        } finally {
-                            file.delete();
-                        }*/
                 }
-                /*} catch (Exception e) {
-                    e.printStackTrace();
-                }*/
             }
 
 
@@ -509,7 +480,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                     @Override
                     public void run() {
                         try {
-                            log.info("开始抽帧");
+                            log.info("开始抽帧,code:{}", code);
                             materialCutFrameService.getTencentCutFrame(videoUrl, code, coverUrl);
                         } catch (Exception e) {
                             e.printStackTrace();

+ 0 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -45,7 +45,6 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
     @Value("${oss.replace.download}")
     private String downloadUrl;
 
-
     @Autowired
     private CtopOauthTokenMapper oauthTokenMapper;
     @Autowired

+ 19 - 17
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouMaterialUploadServiceImpl.java

@@ -1,15 +1,17 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.module.enums.MaterialEnum;
-import cn.com.ctop.common.module.utils.*;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
+import cn.com.ctop.common.module.utils.LoadFileUtil;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
@@ -25,7 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -40,6 +41,8 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
     private IKuaiShouImageGetService iKuaiShouImageGetService;
     @Autowired
     private IKuaiShouVideoGetService kuaiShouVideoGetService;
+    @Autowired
+    private IKuaishouInterfaceService kuaishouInterfaceService;
 
     /**
      * 上传文件
@@ -72,23 +75,22 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
                     JSONObject dataJson = resultJson.getJSONObject("data");
                     if (!Check.isNull(dataJson)) {
                         String photoId = dataJson.getString("photo_id");
-                        KuaiShouVideoGet videoGet = new KuaiShouVideoGet();
-                        videoGet.setAccountId(accountId);
-                        videoGet.setId(accountId + photoId);
-                        videoGet.setUrl(url);
-                        videoGet.setMaterialType(type);
-                        videoGet.setPhotoId(photoId);
-                        videoGet.setSignature(signature);
-                        videoGet.setStatDate(DateUtils.getNowDate());
-                        String videoUrl = URLDecoder.decode(url).replace("https://media-1301855440.cos.ap-chongqing.myqcloud.com/", "");
-                        String loadImage = "cutFrame/" + signature + "/zero.jpg";
-                        String coverUrl = CloudVideoProcessUtil.videoCutPictureHandle(videoUrl, loadImage);
-                        videoGet.setCoverUrl(coverUrl);
-                        kuaiShouVideoGetService.saveOrUpdate(videoGet);
                         returnJson.put("success", true);
                         returnJson.put("photoId", photoId);
                         returnJson.put("signature", signature);
                         returnJson.put("message", "上传成功");
+                        Thread thread = new Thread() {
+                            @Override
+                            public void run() {
+                                try {
+                                    Thread.sleep(2 * 1000L);
+                                    kuaishouInterfaceService.getVideoInfo(accessToken, accountId, photoId);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        };
+                        thread.start();
                     }
                     LoadFileUtil.delFile(localUrl);
                     log.info("快手素材上传完成,accountId:{},code:{},返回信息:{}", accountId, signature, resultJson);