optimize code

content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/job/VideoContentUnderstandingJob.java

@@ -61,19 +61,4 @@ public class VideoContentUnderstandingJob {
         }
         return ReturnT.SUCCESS;
     }
-
-
-    @XxlJob("remainVideoUnderstandingHandler")
-    public ReturnT<String> remainVideoUnderstandingHandler(String params) {
-        XxlJobLogger.log("remainVideoUnderstandingHandler start");
-        try {
-            contentService.remainVideoUnderstandingHandler();
-        } catch (Exception e) {
-            XxlJobLogger.log("remainVideoUnderstandingHandler error", e);
-            return ReturnT.FAIL;
-        } finally {
-            XxlJobLogger.log("remainVideoUnderstandingHandler end");
-        }
-        return ReturnT.SUCCESS;
-    }
 }

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/service/ContentService.java

@@ -46,11 +46,6 @@ public interface ContentService {
      */
     void historyVideoUnderstandingHandler();
 
-    /**
-     * 剩余视频处理
-     */
-    void remainVideoUnderstandingHandler();
-
     /**
      * 剩余视频处理
      * @param videoId

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

@@ -22,6 +22,7 @@ public interface PipelineService {
      * @param contentDTO
      * @return taskId
      */
+    @Deprecated
     String executeTask(ContentDTO contentDTO);
 
     /**

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);
                     //上报日志
@@ -538,11 +538,6 @@ public class ContentServiceImpl implements ContentService {
         return videoUrl;
     }
 
-    @Override
-    public void remainVideoUnderstandingHandler() {
-
-    }
-
     @Override
     public boolean remainVideoUnderstandingHandler(Long videoId) {
         try {
@@ -555,7 +550,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);