update

content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/dto/ContentDTO.java

@@ -26,11 +26,11 @@ public class ContentDTO {
      * 必需
      */
     private Long pipelineId;
-    /**
-     * 输入内容类型
-     * 非必需
-     */
-    private Integer contentType;
+//    /**
+//     * 输入内容类型
+//     * 非必需
+//     */
+//    private Integer contentType;
 
     private Map<String,Object> extMap;
 }

content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/rocketmq/producer/ContentUnderstandingPipelineTaskDelayProducer.java

@@ -33,6 +33,6 @@ public class ContentUnderstandingPipelineTaskDelayProducer {
                 throw new RuntimeException("OldVersionRemainVideoUnderstandingProducer syncSendDelayMessage failure messageDTO = " + messageDTO);
             }
             return sendReceipt.getMessageId();
-        }, "OldVersionRemainVideoUnderstandingProducer");
+        }, "ContentUnderstandingPipelineTaskDelayProducer");
     }
 }

content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/service/impl/ContentServiceImpl.java

@@ -156,7 +156,7 @@ public class ContentServiceImpl implements ContentService {
             if (Objects.isNull(cuPipeline) || !ContentTypeEnum.containsValue(cuPipeline.getContentType())) {
                 throw new CommonException(ExceptionEnum.PARAMS_INVALID, "pipelineId [" + pipelineId + "]配置异常");
             }
-            contentDTO.setContentType(cuPipeline.getContentType());
+//            contentDTO.setContentType(cuPipeline.getContentType());
         }
         //执行任务
         TaskResultVO taskResultVO = new TaskResultVO();
@@ -222,7 +222,7 @@ public class ContentServiceImpl implements ContentService {
                     List<ContentDTO> contentDTOList = new ArrayList<>();
                     ContentDTO contentDTO = new ContentDTO();
                     contentDTO.setVideoId(videoId);
-                    contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
+//                    contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
                     contentDTO.setContent(videoUrl);
                     contentDTO.setPipelineId(oldVersionPipelineId);
                     //上报日志
@@ -290,7 +290,7 @@ public class ContentServiceImpl implements ContentService {
                     List<ContentDTO> contentDTOList = new ArrayList<>();
                     ContentDTO contentDTO = new ContentDTO();
                     contentDTO.setVideoId(videoId);
-                    contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
+//                    contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
                     contentDTO.setContent(videoUrl);
                     contentDTO.setPipelineId(oldVersionPipelineId);
                     //上报日志
@@ -357,7 +357,7 @@ public class ContentServiceImpl implements ContentService {
                     List<ContentDTO> contentDTOList = new ArrayList<>();
                     ContentDTO contentDTO = new ContentDTO();
                     contentDTO.setVideoId(videoId);
-                    contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
+//                    contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
                     contentDTO.setContent(videoUrl);
                     contentDTO.setPipelineId(oldVersionPipelineId);
                     //上报日志
@@ -431,7 +431,7 @@ public class ContentServiceImpl implements ContentService {
         if (Objects.isNull(videoUrl) && !isM3u8) {
             WxVideo wxVideo = wxVideoMapper.selectByPrimaryKey(videoId);
             if (Objects.isNull(wxVideo)) {
-                XxlJobLogger.log("table = {} videoId = {} wxVideo is null", topReturnTable, videoId);
+                XxlJobLogger.log("videoId = {} wxVideo is null", videoId);
                 return null;
             }
             String transedVideoPath = wxVideo.getTransedVideoPath();
@@ -488,7 +488,7 @@ public class ContentServiceImpl implements ContentService {
         if (Objects.isNull(videoUrl)) {
             WxVideo wxVideo = wxVideoMapper.selectByPrimaryKey(videoId);
             if (Objects.isNull(wxVideo)) {
-                XxlJobLogger.log("table = {} videoId = {} wxVideo is null", topReturnTable, videoId);
+                XxlJobLogger.log("videoId = {} wxVideo is null", videoId);
                 return null;
             }
             String videoPath = wxVideo.getVideoPath();
@@ -555,7 +555,7 @@ public class ContentServiceImpl implements ContentService {
             List<ContentDTO> contentDTOList = new ArrayList<>();
             ContentDTO contentDTO = new ContentDTO();
             contentDTO.setVideoId(videoId);
-            contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
+//            contentDTO.setContentType(ContentTypeEnum.VIDEO.getValue());
             contentDTO.setContent(videoUrl);
             contentDTO.setPipelineId(oldVersionPipelineId);
             contentDTOList.add(contentDTO);

content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/service/impl/PipelineServiceImpl.java

@@ -136,7 +136,7 @@ public class PipelineServiceImpl implements PipelineService {
             throw new CommonException(ExceptionEnum.SYSTEM_ERROR, "新增任务失败");
         }
         // 2.获取pipeline配置
-        Integer contentType = contentDTO.getContentType();
+//        Integer contentType = contentDTO.getContentType();
         CuPipelineStepExample example = new CuPipelineStepExample();
         example.createCriteria().andPipelineIdEqualTo(pipelineId);
         List<CuPipelineStep> stepList = cuPipelineStepMapper.selectByExample(example);
@@ -150,7 +150,7 @@ public class PipelineServiceImpl implements PipelineService {
         pool.execute(() -> {
             // 3.构建tree结构
             TreeNode root = buildTree(stepList);
-            root.setType(contentType);
+//            root.setType(contentType);
             root.setInput(content);
             ContentAnalyseDTO dto1 = new ContentAnalyseDTO();
             dto1.setTaskId(taskId);