supeng 2 月之前
父节点
当前提交
e61296c2ed
共有 20 个文件被更改,包括 522 次插入187 次删除
  1. 21 2
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/common/enums/ContentTypeEnum.java
  2. 11 11
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/dao/mapper/CuPipelineMapper.java
  3. 11 11
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/dao/mapper/CuTaskMapper.java
  4. 16 0
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/dto/ContentDTO.java
  5. 5 1
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/dto/TaskInfoDTO.java
  6. 23 0
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/param/QueryTasksParam.java
  7. 26 0
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/param/SubmitTasksParam.java
  8. 52 16
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuPipeline.java
  9. 77 17
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuPipelineExample.java
  10. 28 28
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuTask.java
  11. 17 17
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuTaskExample.java
  12. 2 2
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/service/ContentService.java
  13. 8 0
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/service/PipelineService.java
  14. 56 33
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/service/impl/ContentServiceImpl.java
  15. 57 7
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/service/impl/PipelineServiceImpl.java
  16. 52 0
      content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/util/RetryUtil.java
  17. 37 20
      content-understanding-core/src/main/resources/mapper/CuPipelineMapper.xml
  18. 15 15
      content-understanding-core/src/main/resources/mapper/CuTaskMapper.xml
  19. 2 2
      content-understanding-core/src/main/resources/mybatis-generator-config.xml
  20. 6 5
      content-understanding-server/src/main/java/com/tzld/piaoquan/content/understanding/controller/ContentUnderstandingController.java

+ 21 - 2
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/common/enums/ContentTypeEnum.java

@@ -14,8 +14,8 @@ public enum ContentTypeEnum {
     VIDEO(2, "视频"),
     INTRODUCTION(3, "简介"),
     AUDIO(4, "音频"),
-    SRT(5, "字幕"),
-    VTT(6, "字幕");
+    SRT_VTT(5, "字幕");
+//    VTT(6, "字幕");
 
     private final Integer value;
     private final String desc;
@@ -24,4 +24,23 @@ public enum ContentTypeEnum {
         this.value = value;
         this.desc = desc;
     }
+
+    public static ContentTypeEnum getByValue(Integer value) {
+        for (ContentTypeEnum contentTypeEnum : ContentTypeEnum.values()) {
+            if (contentTypeEnum.getValue().equals(value)) {
+                return contentTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    public static boolean containsValue(Integer value) {
+        for (ContentTypeEnum contentTypeEnum : ContentTypeEnum.values()) {
+            if (contentTypeEnum.getValue().equals(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

+ 11 - 11
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/dao/mapper/CuPipelineMapper.java

@@ -10,7 +10,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     long countByExample(CuPipelineExample example);
 
@@ -18,7 +18,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int deleteByExample(CuPipelineExample example);
 
@@ -26,7 +26,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int deleteByPrimaryKey(Long id);
 
@@ -34,7 +34,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int insert(CuPipeline record);
 
@@ -42,7 +42,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int insertSelective(CuPipeline record);
 
@@ -50,7 +50,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     List<CuPipeline> selectByExample(CuPipelineExample example);
 
@@ -58,7 +58,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     CuPipeline selectByPrimaryKey(Long id);
 
@@ -66,7 +66,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int updateByExampleSelective(@Param("record") CuPipeline record, @Param("example") CuPipelineExample example);
 
@@ -74,7 +74,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int updateByExample(@Param("record") CuPipeline record, @Param("example") CuPipelineExample example);
 
@@ -82,7 +82,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int updateByPrimaryKeySelective(CuPipeline record);
 
@@ -90,7 +90,7 @@ public interface CuPipelineMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     int updateByPrimaryKey(CuPipeline record);
 }

+ 11 - 11
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/dao/mapper/CuTaskMapper.java

@@ -10,7 +10,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     long countByExample(CuTaskExample example);
 
@@ -18,7 +18,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int deleteByExample(CuTaskExample example);
 
@@ -26,7 +26,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int deleteByPrimaryKey(Long id);
 
@@ -34,7 +34,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int insert(CuTask record);
 
@@ -42,7 +42,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int insertSelective(CuTask record);
 
@@ -50,7 +50,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     List<CuTask> selectByExample(CuTaskExample example);
 
@@ -58,7 +58,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     CuTask selectByPrimaryKey(Long id);
 
@@ -66,7 +66,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int updateByExampleSelective(@Param("record") CuTask record, @Param("example") CuTaskExample example);
 
@@ -74,7 +74,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int updateByExample(@Param("record") CuTask record, @Param("example") CuTaskExample example);
 
@@ -82,7 +82,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int updateByPrimaryKeySelective(CuTask record);
 
@@ -90,7 +90,7 @@ public interface CuTaskMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     int updateByPrimaryKey(CuTask record);
 }

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

@@ -0,0 +1,16 @@
+package com.tzld.piaoquan.content.understanding.model.dto;
+
+import lombok.Data;
+
+/**
+ * 内容信息
+ *
+ * @author supeng
+ */
+@Data
+public class ContentDTO {
+    private Long videoId;
+    private String content;
+    private Long pipelineId;
+    private Integer contentType;
+}

+ 5 - 1
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/dto/TaskInfoDTO.java

@@ -10,7 +10,11 @@ import java.util.Date;
 @Data
 public class TaskInfoDTO {
     private String taskId;
-    private String pipelineId;
+    private Long pipelineId;
+    /**
+     * @see com.tzld.piaoquan.content.understanding.common.enums.ContentTypeEnum
+     */
+    private Integer contentType;
     /**
      * @see com.tzld.piaoquan.content.understanding.common.enums.TaskStatusEnum
      */

+ 23 - 0
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/param/QueryTasksParam.java

@@ -0,0 +1,23 @@
+package com.tzld.piaoquan.content.understanding.model.param;
+
+import com.tzld.piaoquan.content.understanding.model.dto.ContentInfoDTO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author supeng
+ */
+@Data
+public class QueryTasksParam {
+    /**
+     * 内容理解维度
+     *
+     * @see com.tzld.piaoquan.content.understanding.common.enums.ContentTypeEnum
+     */
+    private List<Integer> contentTypes;
+    /**
+     * 内容信息
+     */
+    private ContentInfoDTO contentInfo;
+}

+ 26 - 0
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/param/SubmitTasksParam.java

@@ -0,0 +1,26 @@
+package com.tzld.piaoquan.content.understanding.model.param;
+
+import com.tzld.piaoquan.content.understanding.model.dto.ContentDTO;
+import com.tzld.piaoquan.content.understanding.model.dto.ContentInfoDTO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author supeng
+ */
+@Data
+public class SubmitTasksParam {
+//    /**
+//     * 内容理解维度
+//     *
+//     * @see com.tzld.piaoquan.content.understanding.common.enums.ContentTypeEnum
+//     */
+//    private List<Integer> contentTypes;
+//    /**
+//     * 内容信息
+//     */
+//    private ContentInfoDTO contentInfo;
+
+    private List<ContentDTO> contents;
+}

+ 52 - 16
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuPipeline.java

@@ -15,7 +15,7 @@ public class CuPipeline {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_pipeline.id
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     private Long id;
 
@@ -26,10 +26,21 @@ public class CuPipeline {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_pipeline.name
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     private String name;
 
+    /**
+     * Database Column Remarks:
+     *   内容类型:0 标题 1 封面 2 视频 3 简介 4 音频 5 字幕
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cu_pipeline.content_type
+     *
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
+     */
+    private Integer contentType;
+
     /**
      * Database Column Remarks:
      *   是否有效:0 无效 1 有效
@@ -37,7 +48,7 @@ public class CuPipeline {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_pipeline.data_status
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     private Integer dataStatus;
 
@@ -48,7 +59,7 @@ public class CuPipeline {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_pipeline.create_time
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     private Date createTime;
 
@@ -59,7 +70,7 @@ public class CuPipeline {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_pipeline.update_time
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     private Date updateTime;
 
@@ -69,7 +80,7 @@ public class CuPipeline {
      *
      * @return the value of cu_pipeline.id
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public Long getId() {
         return id;
@@ -81,7 +92,7 @@ public class CuPipeline {
      *
      * @param id the value for cu_pipeline.id
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void setId(Long id) {
         this.id = id;
@@ -93,7 +104,7 @@ public class CuPipeline {
      *
      * @return the value of cu_pipeline.name
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public String getName() {
         return name;
@@ -105,19 +116,43 @@ public class CuPipeline {
      *
      * @param name the value for cu_pipeline.name
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void setName(String name) {
         this.name = name;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cu_pipeline.content_type
+     *
+     * @return the value of cu_pipeline.content_type
+     *
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
+     */
+    public Integer getContentType() {
+        return contentType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cu_pipeline.content_type
+     *
+     * @param contentType the value for cu_pipeline.content_type
+     *
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
+     */
+    public void setContentType(Integer contentType) {
+        this.contentType = contentType;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column cu_pipeline.data_status
      *
      * @return the value of cu_pipeline.data_status
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public Integer getDataStatus() {
         return dataStatus;
@@ -129,7 +164,7 @@ public class CuPipeline {
      *
      * @param dataStatus the value for cu_pipeline.data_status
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void setDataStatus(Integer dataStatus) {
         this.dataStatus = dataStatus;
@@ -141,7 +176,7 @@ public class CuPipeline {
      *
      * @return the value of cu_pipeline.create_time
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public Date getCreateTime() {
         return createTime;
@@ -153,7 +188,7 @@ public class CuPipeline {
      *
      * @param createTime the value for cu_pipeline.create_time
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
@@ -165,7 +200,7 @@ public class CuPipeline {
      *
      * @return the value of cu_pipeline.update_time
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public Date getUpdateTime() {
         return updateTime;
@@ -177,7 +212,7 @@ public class CuPipeline {
      *
      * @param updateTime the value for cu_pipeline.update_time
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
@@ -187,7 +222,7 @@ public class CuPipeline {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     @Override
     public String toString() {
@@ -197,6 +232,7 @@ public class CuPipeline {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", name=").append(name);
+        sb.append(", contentType=").append(contentType);
         sb.append(", dataStatus=").append(dataStatus);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);

+ 77 - 17
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuPipelineExample.java

@@ -9,7 +9,7 @@ public class CuPipelineExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     protected String orderByClause;
 
@@ -17,7 +17,7 @@ public class CuPipelineExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     protected boolean distinct;
 
@@ -25,7 +25,7 @@ public class CuPipelineExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     protected List<Criteria> oredCriteria;
 
@@ -33,7 +33,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public CuPipelineExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -43,7 +43,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +53,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -63,7 +63,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +73,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +83,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +93,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +103,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +115,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +129,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +140,7 @@ public class CuPipelineExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public void clear() {
         oredCriteria.clear();
@@ -152,7 +152,7 @@ public class CuPipelineExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -325,6 +325,66 @@ public class CuPipelineExample {
             return (Criteria) this;
         }
 
+        public Criteria andContentTypeIsNull() {
+            addCriterion("content_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeIsNotNull() {
+            addCriterion("content_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeEqualTo(Integer value) {
+            addCriterion("content_type =", value, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeNotEqualTo(Integer value) {
+            addCriterion("content_type <>", value, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeGreaterThan(Integer value) {
+            addCriterion("content_type >", value, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("content_type >=", value, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeLessThan(Integer value) {
+            addCriterion("content_type <", value, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("content_type <=", value, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeIn(List<Integer> values) {
+            addCriterion("content_type in", values, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeNotIn(List<Integer> values) {
+            addCriterion("content_type not in", values, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeBetween(Integer value1, Integer value2) {
+            addCriterion("content_type between", value1, value2, "contentType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("content_type not between", value1, value2, "contentType");
+            return (Criteria) this;
+        }
+
         public Criteria andDataStatusIsNull() {
             addCriterion("data_status is null");
             return (Criteria) this;
@@ -510,7 +570,7 @@ public class CuPipelineExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table cu_pipeline
      *
-     * @mbg.generated do_not_delete_during_merge Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated do_not_delete_during_merge Wed Apr 02 16:06:15 CST 2025
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -523,7 +583,7 @@ public class CuPipelineExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table cu_pipeline
      *
-     * @mbg.generated Tue Mar 25 15:25:39 CST 2025
+     * @mbg.generated Wed Apr 02 16:06:15 CST 2025
      */
     public static class Criterion {
         private String condition;

+ 28 - 28
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuTask.java

@@ -15,7 +15,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private Long id;
 
@@ -26,7 +26,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.task_id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private String taskId;
 
@@ -37,7 +37,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.pipeline_id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private Long pipelineId;
 
@@ -48,7 +48,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.task_status
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private Integer taskStatus;
 
@@ -59,7 +59,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.input
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private String input;
 
@@ -70,7 +70,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.output
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private String output;
 
@@ -81,7 +81,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.reason
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private String reason;
 
@@ -92,7 +92,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.create_time
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private Date createTime;
 
@@ -103,7 +103,7 @@ public class CuTask {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cu_task.update_time
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     private Date updateTime;
 
@@ -113,7 +113,7 @@ public class CuTask {
      *
      * @return the value of cu_task.id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public Long getId() {
         return id;
@@ -125,7 +125,7 @@ public class CuTask {
      *
      * @param id the value for cu_task.id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setId(Long id) {
         this.id = id;
@@ -137,7 +137,7 @@ public class CuTask {
      *
      * @return the value of cu_task.task_id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public String getTaskId() {
         return taskId;
@@ -149,7 +149,7 @@ public class CuTask {
      *
      * @param taskId the value for cu_task.task_id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setTaskId(String taskId) {
         this.taskId = taskId;
@@ -161,7 +161,7 @@ public class CuTask {
      *
      * @return the value of cu_task.pipeline_id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public Long getPipelineId() {
         return pipelineId;
@@ -173,7 +173,7 @@ public class CuTask {
      *
      * @param pipelineId the value for cu_task.pipeline_id
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setPipelineId(Long pipelineId) {
         this.pipelineId = pipelineId;
@@ -185,7 +185,7 @@ public class CuTask {
      *
      * @return the value of cu_task.task_status
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public Integer getTaskStatus() {
         return taskStatus;
@@ -197,7 +197,7 @@ public class CuTask {
      *
      * @param taskStatus the value for cu_task.task_status
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setTaskStatus(Integer taskStatus) {
         this.taskStatus = taskStatus;
@@ -209,7 +209,7 @@ public class CuTask {
      *
      * @return the value of cu_task.input
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public String getInput() {
         return input;
@@ -221,7 +221,7 @@ public class CuTask {
      *
      * @param input the value for cu_task.input
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setInput(String input) {
         this.input = input;
@@ -233,7 +233,7 @@ public class CuTask {
      *
      * @return the value of cu_task.output
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public String getOutput() {
         return output;
@@ -245,7 +245,7 @@ public class CuTask {
      *
      * @param output the value for cu_task.output
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setOutput(String output) {
         this.output = output;
@@ -257,7 +257,7 @@ public class CuTask {
      *
      * @return the value of cu_task.reason
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public String getReason() {
         return reason;
@@ -269,7 +269,7 @@ public class CuTask {
      *
      * @param reason the value for cu_task.reason
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setReason(String reason) {
         this.reason = reason;
@@ -281,7 +281,7 @@ public class CuTask {
      *
      * @return the value of cu_task.create_time
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public Date getCreateTime() {
         return createTime;
@@ -293,7 +293,7 @@ public class CuTask {
      *
      * @param createTime the value for cu_task.create_time
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
@@ -305,7 +305,7 @@ public class CuTask {
      *
      * @return the value of cu_task.update_time
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public Date getUpdateTime() {
         return updateTime;
@@ -317,7 +317,7 @@ public class CuTask {
      *
      * @param updateTime the value for cu_task.update_time
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
@@ -327,7 +327,7 @@ public class CuTask {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     @Override
     public String toString() {

+ 17 - 17
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/model/po/CuTaskExample.java

@@ -9,7 +9,7 @@ public class CuTaskExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     protected String orderByClause;
 
@@ -17,7 +17,7 @@ public class CuTaskExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     protected boolean distinct;
 
@@ -25,7 +25,7 @@ public class CuTaskExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     protected List<Criteria> oredCriteria;
 
@@ -33,7 +33,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public CuTaskExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -43,7 +43,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +53,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -63,7 +63,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +73,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +83,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +93,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +103,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +115,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +129,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +140,7 @@ public class CuTaskExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public void clear() {
         oredCriteria.clear();
@@ -152,7 +152,7 @@ public class CuTaskExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -780,7 +780,7 @@ public class CuTaskExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table cu_task
      *
-     * @mbg.generated do_not_delete_during_merge Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated do_not_delete_during_merge Wed Apr 02 15:03:39 CST 2025
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -793,7 +793,7 @@ public class CuTaskExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table cu_task
      *
-     * @mbg.generated Wed Apr 02 14:59:58 CST 2025
+     * @mbg.generated Wed Apr 02 15:03:39 CST 2025
      */
     public static class Criterion {
         private String condition;

+ 2 - 2
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/service/ContentService.java

@@ -3,6 +3,7 @@ package com.tzld.piaoquan.content.understanding.service;
 import com.tzld.piaoquan.content.understanding.model.dto.TaskResultDTO;
 import com.tzld.piaoquan.content.understanding.model.param.ContentAnalyseParam;
 import com.tzld.piaoquan.content.understanding.model.param.ContentUnderstandParam;
+import com.tzld.piaoquan.content.understanding.model.param.SubmitTasksParam;
 
 /**
  * @author supeng
@@ -15,7 +16,6 @@ public interface ContentService {
      * @param param
      */
     void analyse(ContentAnalyseParam param);
-
     void understand(ContentUnderstandParam param);
 
     /**
@@ -24,7 +24,7 @@ public interface ContentService {
      * @param param
      * @return
      */
-    TaskResultDTO submitTasks(ContentUnderstandParam param);
+    TaskResultDTO submitTasks(SubmitTasksParam param);
 
     /**
      * 查询任务

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

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.content.understanding.service;
 
+import com.tzld.piaoquan.content.understanding.model.dto.ContentDTO;
 import com.tzld.piaoquan.content.understanding.model.dto.ContentUnderstandDTO;
 import com.tzld.piaoquan.content.understanding.model.param.ContentAnalyseParam;
 
@@ -10,5 +11,12 @@ public interface PipelineService {
 
     void execute(ContentAnalyseParam param);
 
+    /**
+     * 执行流程
+     *
+     * @param dto
+     */
     void execute(ContentUnderstandDTO dto);
+
+    void execute(ContentDTO contentDTO);
 }

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

@@ -1,13 +1,20 @@
 package com.tzld.piaoquan.content.understanding.service.impl;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
+import com.tzld.piaoquan.content.understanding.common.enums.ContentTypeEnum;
+import com.tzld.piaoquan.content.understanding.common.enums.DataStatusEnum;
 import com.tzld.piaoquan.content.understanding.common.enums.ExceptionEnum;
 import com.tzld.piaoquan.content.understanding.common.exception.CommonException;
+import com.tzld.piaoquan.content.understanding.dao.mapper.CuPipelineMapper;
+import com.tzld.piaoquan.content.understanding.model.dto.ContentDTO;
 import com.tzld.piaoquan.content.understanding.model.dto.ContentUnderstandDTO;
 import com.tzld.piaoquan.content.understanding.model.dto.TaskInfoDTO;
 import com.tzld.piaoquan.content.understanding.model.dto.TaskResultDTO;
 import com.tzld.piaoquan.content.understanding.model.param.ContentAnalyseParam;
 import com.tzld.piaoquan.content.understanding.model.param.ContentUnderstandParam;
+import com.tzld.piaoquan.content.understanding.model.param.SubmitTasksParam;
+import com.tzld.piaoquan.content.understanding.model.po.CuPipeline;
+import com.tzld.piaoquan.content.understanding.model.po.CuPipelineExample;
 import com.tzld.piaoquan.content.understanding.service.ContentService;
 import com.tzld.piaoquan.content.understanding.service.LoghubService;
 import com.tzld.piaoquan.content.understanding.service.PipelineService;
@@ -37,6 +44,8 @@ public class ContentServiceImpl implements ContentService {
 
     @ApolloJsonValue("${content.understand.pipeline.config:{}}")
     private Map<String, Long> configMap;
+    @Autowired
+    private CuPipelineMapper cuPipelineMapper;
 
     @Override
     public void analyse(ContentAnalyseParam param) {
@@ -49,45 +58,59 @@ public class ContentServiceImpl implements ContentService {
 
     @Override
     public void understand(ContentUnderstandParam param) {
-        if (Objects.isNull(param) || Objects.isNull(param.getContentTypes()) || param.getContentTypes().isEmpty()
-                || Objects.isNull(param.getContentInfo())) {
+//        if (Objects.isNull(param) || Objects.isNull(param.getContentTypes()) || param.getContentTypes().isEmpty()
+//                || Objects.isNull(param.getContentInfo())) {
+//            throw new CommonException(ExceptionEnum.PARAMS_INVALID);
+//        }
+//        //生成jobId
+//        String jobId = UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis();
+//        for (Integer contentType : param.getContentTypes()) {
+//            Long pipelineId = configMap.get(contentType.toString());
+//            if (Objects.isNull(pipelineId)) {
+//                //TODO 日志上报 && 记录状态
+//                log.info("jobId = {}", jobId);
+//                continue;
+//            }
+//            ContentUnderstandDTO dto = new ContentUnderstandDTO();
+//            BeanUtils.copyProperties(param.getContentInfo(), dto);
+//            dto.setPipelineId(pipelineId);
+//            dto.setContentType(contentType);
+//            pipelineService.execute(dto);
+//        }
+    }
+
+    @Override
+    public TaskResultDTO submitTasks(SubmitTasksParam param) {
+        //参数校验
+        if (Objects.isNull(param) || Objects.isNull(param.getContents()) || param.getContents().isEmpty()) {
             throw new CommonException(ExceptionEnum.PARAMS_INVALID);
         }
-        //生成jobId
-        String jobId = UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis();
-        for (Integer contentType : param.getContentTypes()) {
-            Long pipelineId = configMap.get(contentType.toString());
-            if (Objects.isNull(pipelineId)) {
-                //TODO 日志上报 && 记录状态
-                log.info("jobId = {}", jobId);
-                continue;
+        List<ContentDTO> contentDTOList = param.getContents();
+        //数据校验
+        for (ContentDTO contentDTO : contentDTOList) {
+            if (Objects.isNull(contentDTO) || Objects.isNull(contentDTO.getPipelineId()) || Objects.isNull(contentDTO.getContent())) {
+                throw new CommonException(ExceptionEnum.PARAMS_INVALID);
+            }
+            Long pipelineId = contentDTO.getPipelineId();
+            CuPipelineExample example = new CuPipelineExample();
+            example.createCriteria().andIdEqualTo(pipelineId).andDataStatusEqualTo(DataStatusEnum.VALID.getValue());
+            List<CuPipeline> list = cuPipelineMapper.selectByExample(example);
+            if (Objects.isNull(list) || list.isEmpty()) {
+                throw new CommonException(ExceptionEnum.PARAMS_INVALID, "pipelineId [" + pipelineId + "]无效");
             }
-            ContentUnderstandDTO dto = new ContentUnderstandDTO();
-            BeanUtils.copyProperties(param.getContentInfo(), dto);
-            dto.setPipelineId(pipelineId);
-            dto.setContentType(contentType);
-            pipelineService.execute(dto);
+            CuPipeline cuPipeline = list.get(0);
+            if (Objects.isNull(cuPipeline) || !ContentTypeEnum.containsValue(cuPipeline.getContentType())) {
+                throw new CommonException(ExceptionEnum.PARAMS_INVALID, "pipelineId [" + pipelineId + "]配置异常");
+            }
+            contentDTO.setContentType(cuPipeline.getContentType());
         }
-    }
-
-    @Override
-    public TaskResultDTO submitTasks(ContentUnderstandParam param) {
+        //执行任务
         TaskResultDTO taskResultDTO = new TaskResultDTO();
         List<TaskInfoDTO> taskInfoDTOS = new ArrayList<>();
-        for (Integer contentType : param.getContentTypes()) {
-            Long pipelineId = configMap.get(contentType.toString());
-            if (Objects.isNull(pipelineId)) {
-                //TODO 日志上报 && 记录状态
-                continue;
-            }
-            //生成 taskId
-            String taskId = UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis();
-            log.info("contentType = {} pipelineId = {} taskId = {}", contentType, pipelineId, taskId);
-            ContentUnderstandDTO dto = new ContentUnderstandDTO();
-            BeanUtils.copyProperties(param.getContentInfo(), dto);
-            dto.setPipelineId(pipelineId);
-            dto.setContentType(contentType);
-            pipelineService.execute(dto);
+        for (ContentDTO contentDTO : contentDTOList) {
+            TaskInfoDTO taskInfoDTO = new TaskInfoDTO();
+            BeanUtils.copyProperties(contentDTO, taskInfoDTO);
+            pipelineService.execute(contentDTO);
         }
         taskResultDTO.setTaskList(taskInfoDTOS);
         return taskResultDTO;

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

@@ -8,7 +8,9 @@ import com.tzld.piaoquan.content.understanding.common.exception.CommonException;
 import com.tzld.piaoquan.content.understanding.dao.mapper.CuPipelineMapper;
 import com.tzld.piaoquan.content.understanding.dao.mapper.CuPipelineStepMapper;
 import com.tzld.piaoquan.content.understanding.dao.mapper.CuPromptMapper;
+import com.tzld.piaoquan.content.understanding.dao.mapper.CuTaskMapper;
 import com.tzld.piaoquan.content.understanding.model.dto.ContentAnalyseDTO;
+import com.tzld.piaoquan.content.understanding.model.dto.ContentDTO;
 import com.tzld.piaoquan.content.understanding.model.dto.ContentUnderstandDTO;
 import com.tzld.piaoquan.content.understanding.model.dto.TreeNode;
 import com.tzld.piaoquan.content.understanding.model.param.ActionParam;
@@ -16,6 +18,7 @@ import com.tzld.piaoquan.content.understanding.model.param.ContentAnalyseParam;
 import com.tzld.piaoquan.content.understanding.model.po.CuPipelineStep;
 import com.tzld.piaoquan.content.understanding.model.po.CuPipelineStepExample;
 import com.tzld.piaoquan.content.understanding.model.po.CuPrompt;
+import com.tzld.piaoquan.content.understanding.model.po.CuTask;
 import com.tzld.piaoquan.content.understanding.service.Action;
 import com.tzld.piaoquan.content.understanding.service.PipelineService;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +53,9 @@ public class PipelineServiceImpl implements PipelineService {
 
     private static final String COLLECTION_NAME = "content_understanding_info";
 
+    @Autowired
+    private CuTaskMapper cuTaskMapper;
+
     @Override
     public void execute(ContentAnalyseParam param) {
         // 1.获取pipeline配置
@@ -74,8 +80,16 @@ public class PipelineServiceImpl implements PipelineService {
 
     @Override
     public void execute(ContentUnderstandDTO dto) {
-        // 1.获取pipeline配置
+        // 1.数据准备
         Long pipelineId = dto.getPipelineId();
+        // 1.新增任务
+        String taskId = UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis();
+        CuTask cuTask = new CuTask();
+        cuTask.setTaskId(taskId);
+        cuTask.setPipelineId(pipelineId);
+//        cuTask.setInput();
+        int insertCount = cuTaskMapper.insertSelective(cuTask);
+        // 2.获取pipeline配置
         Integer contentType = dto.getContentType();
         CuPipelineStepExample example = new CuPipelineStepExample();
         example.createCriteria().andPipelineIdEqualTo(pipelineId);
@@ -83,7 +97,7 @@ public class PipelineServiceImpl implements PipelineService {
         if (Objects.isNull(stepList) || stepList.isEmpty()) {
             throw new CommonException(ExceptionEnum.CONFIG_ERROR, "无配置 pipelineId:" + pipelineId);
         }
-        // 2.构建tree结构
+        // 3.构建tree结构
         TreeNode root = buildTree(stepList);
         root.setType(contentType);
         String content = getContent(dto, contentType);
@@ -94,7 +108,45 @@ public class PipelineServiceImpl implements PipelineService {
         ContentAnalyseDTO dto1 = new ContentAnalyseDTO();
         dto1.setVideoId(dto.getVideoId());
         dto1.setContent(content);
-        // 3.按照步骤执行pipeline每一步动作
+        // 4.按照步骤执行pipeline每一步动作
+        executeTreeNodeBFS(root, dto1);
+    }
+
+    @Override
+    public void execute(ContentDTO contentDTO) {
+        // 1.数据准备
+        Long pipelineId = contentDTO.getPipelineId();
+        String content = contentDTO.getContent();
+        // 1.新增任务
+        String taskId = UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis();
+        CuTask cuTask = new CuTask();
+        cuTask.setTaskId(taskId);
+        cuTask.setPipelineId(pipelineId);
+        cuTask.setInput(content);
+        int insertCount = cuTaskMapper.insertSelective(cuTask);
+        String reason = "";
+        if (insertCount <= 0) {
+            throw new CommonException(ExceptionEnum.SYSTEM_ERROR, "");
+        }
+        // 2.获取pipeline配置
+        Integer contentType = contentDTO.getContentType();
+        CuPipelineStepExample example = new CuPipelineStepExample();
+        example.createCriteria().andPipelineIdEqualTo(pipelineId);
+        List<CuPipelineStep> stepList = cuPipelineStepMapper.selectByExample(example);
+        if (Objects.isNull(stepList) || stepList.isEmpty()) {
+            throw new CommonException(ExceptionEnum.CONFIG_ERROR, "无配置 pipelineId:" + pipelineId);
+        }
+        // 3.构建tree结构
+        TreeNode root = buildTree(stepList);
+        root.setType(contentType);
+        if (Objects.isNull(content)) {
+            throw new CommonException(ExceptionEnum.DATA_ERROR, "数据异常content:" + content);
+        }
+        root.setInput(content);
+        ContentAnalyseDTO dto1 = new ContentAnalyseDTO();
+        dto1.setVideoId(contentDTO.getVideoId());
+        dto1.setContent(content);
+        // 4.按照步骤执行pipeline每一步动作
         executeTreeNodeBFS(root, dto1);
     }
 
@@ -110,10 +162,8 @@ public class PipelineServiceImpl implements PipelineService {
             content = dto.getIntroduction();
         } else if (Objects.equals(contentType, ContentTypeEnum.AUDIO.getValue())) {
             content = dto.getAudioUrl();
-        } else if (Objects.equals(contentType, ContentTypeEnum.SRT.getValue())) {
+        } else if (Objects.equals(contentType, ContentTypeEnum.SRT_VTT.getValue())) {
             content = dto.getSrt();
-        } else if (Objects.equals(contentType, ContentTypeEnum.VTT.getValue())) {
-            content = dto.getVtt();
         }
         return content;
     }
@@ -149,7 +199,7 @@ public class PipelineServiceImpl implements PipelineService {
     }
 
     /**
-     * 遍历树结构
+     * 遍历执行
      *
      * @param root 根节点
      * @param dto  数据

+ 52 - 0
content-understanding-core/src/main/java/com/tzld/piaoquan/content/understanding/util/RetryUtil.java

@@ -0,0 +1,52 @@
+package com.tzld.piaoquan.content.understanding.util;
+
+import java.util.function.LongSupplier;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+public class RetryUtil {
+
+    /**
+     * 重试执行操作,直到成功或达到最大重试次数。
+     *
+     * @param operation      需要执行的操作,返回操作结果。
+     * @param successPredicate 判断操作结果是否成功的断言。
+     * @param maxRetries     最大重试次数。
+     * @param operationName  操作名称,用于日志记录。
+     * @param <T>            操作结果的类型。
+     * @return 操作成功的结果,如果所有重试都失败则返回 null。
+     */
+    public static <T> T retry(Supplier<T> operation, Predicate<T> successPredicate, int maxRetries, String operationName) {
+        T result = null;
+        int attempts = 0;
+
+        while (attempts <= maxRetries) {
+            attempts++;
+            try {
+                result = operation.get();
+                if (successPredicate.test(result)) {
+                    return result;
+                } else {
+                    if (attempts <= maxRetries) {
+                        // 可以添加适当的重试间隔,例如 Thread.sleep(1000);
+                    }
+                }
+            } catch (Exception e) {
+                if (attempts <= maxRetries) {
+                    // 可以添加适当的重试间隔,例如 Thread.sleep(1000);
+                }
+            }
+        }
+
+        return null; // 返回 null 表示所有重试都失败
+    }
+    public static void main(String[] args) {
+        // 封装带重试的插入操作
+        RetryUtil.retry(
+                () -> 1,
+                insertCount -> insertCount > 0, // 判断插入影响行数是否大于 0
+                3,
+                "插入 CuTask"
+        );
+    }
+}

+ 37 - 20
content-understanding-core/src/main/resources/mapper/CuPipelineMapper.xml

@@ -5,10 +5,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="content_type" jdbcType="INTEGER" property="contentType" />
     <result column="data_status" jdbcType="INTEGER" property="dataStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -17,7 +18,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -51,7 +52,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -85,15 +86,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
-    id, `name`, data_status, create_time, update_time
+    id, `name`, content_type, data_status, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.content.understanding.model.po.CuPipelineExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     select
     <if test="distinct">
@@ -112,7 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -123,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     delete from cu_pipeline
     where id = #{id,jdbcType=BIGINT}
@@ -132,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     delete from cu_pipeline
     <if test="_parameter != null">
@@ -143,18 +144,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
-    insert into cu_pipeline (id, `name`, data_status, 
-      create_time, update_time)
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{dataStatus,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+    insert into cu_pipeline (id, `name`, content_type, 
+      data_status, create_time, update_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{contentType,jdbcType=INTEGER}, 
+      #{dataStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.content.understanding.model.po.CuPipeline">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     insert into cu_pipeline
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -164,6 +167,9 @@
       <if test="name != null">
         `name`,
       </if>
+      <if test="contentType != null">
+        content_type,
+      </if>
       <if test="dataStatus != null">
         data_status,
       </if>
@@ -181,6 +187,9 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="contentType != null">
+        #{contentType,jdbcType=INTEGER},
+      </if>
       <if test="dataStatus != null">
         #{dataStatus,jdbcType=INTEGER},
       </if>
@@ -196,7 +205,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     select count(*) from cu_pipeline
     <if test="_parameter != null">
@@ -207,7 +216,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     update cu_pipeline
     <set>
@@ -217,6 +226,9 @@
       <if test="record.name != null">
         `name` = #{record.name,jdbcType=VARCHAR},
       </if>
+      <if test="record.contentType != null">
+        content_type = #{record.contentType,jdbcType=INTEGER},
+      </if>
       <if test="record.dataStatus != null">
         data_status = #{record.dataStatus,jdbcType=INTEGER},
       </if>
@@ -235,11 +247,12 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     update cu_pipeline
     set id = #{record.id,jdbcType=BIGINT},
       `name` = #{record.name,jdbcType=VARCHAR},
+      content_type = #{record.contentType,jdbcType=INTEGER},
       data_status = #{record.dataStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
@@ -251,13 +264,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     update cu_pipeline
     <set>
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="contentType != null">
+        content_type = #{contentType,jdbcType=INTEGER},
+      </if>
       <if test="dataStatus != null">
         data_status = #{dataStatus,jdbcType=INTEGER},
       </if>
@@ -274,10 +290,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 25 15:25:39 CST 2025.
+      This element was generated on Wed Apr 02 16:06:15 CST 2025.
     -->
     update cu_pipeline
     set `name` = #{name,jdbcType=VARCHAR},
+      content_type = #{contentType,jdbcType=INTEGER},
       data_status = #{dataStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

+ 15 - 15
content-understanding-core/src/main/resources/mapper/CuTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="task_id" jdbcType="VARCHAR" property="taskId" />
@@ -21,7 +21,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,7 +89,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     id, task_id, pipeline_id, task_status, `input`, `output`, reason, create_time, update_time
   </sql>
@@ -97,7 +97,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     select
     <if test="distinct">
@@ -116,7 +116,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -127,7 +127,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     delete from cu_task
     where id = #{id,jdbcType=BIGINT}
@@ -136,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     delete from cu_task
     <if test="_parameter != null">
@@ -147,7 +147,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     insert into cu_task (id, task_id, pipeline_id, 
       task_status, `input`, `output`, 
@@ -162,7 +162,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     insert into cu_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -228,7 +228,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     select count(*) from cu_task
     <if test="_parameter != null">
@@ -239,7 +239,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     update cu_task
     <set>
@@ -279,7 +279,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     update cu_task
     set id = #{record.id,jdbcType=BIGINT},
@@ -299,7 +299,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     update cu_task
     <set>
@@ -334,7 +334,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 02 14:59:58 CST 2025.
+      This element was generated on Wed Apr 02 15:03:39 CST 2025.
     -->
     update cu_task
     set task_id = #{taskId,jdbcType=VARCHAR},

+ 2 - 2
content-understanding-core/src/main/resources/mybatis-generator-config.xml

@@ -46,10 +46,10 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
 
-<!--        <table tableName="cu_pipeline" domainObjectName="CuPipeline" alias=""/>-->
+        <table tableName="cu_pipeline" domainObjectName="CuPipeline" alias=""/>
 <!--        <table tableName="cu_pipeline_step" domainObjectName="CuPipelineStep" alias=""/>-->
 <!--        <table tableName="cu_prompt" domainObjectName="CuPrompt" alias=""/>-->
-        <table tableName="cu_task" domainObjectName="CuTask" alias=""/>
+<!--        <table tableName="cu_task" domainObjectName="CuTask" alias=""/>-->
 
     </context>
 

+ 6 - 5
content-understanding-server/src/main/java/com/tzld/piaoquan/content/understanding/controller/ContentUnderstandingController.java

@@ -4,6 +4,7 @@ import com.tzld.piaoquan.content.understanding.common.base.CommonResponse;
 import com.tzld.piaoquan.content.understanding.model.dto.TaskResultDTO;
 import com.tzld.piaoquan.content.understanding.model.param.ContentAnalyseParam;
 import com.tzld.piaoquan.content.understanding.model.param.ContentUnderstandParam;
+import com.tzld.piaoquan.content.understanding.model.param.SubmitTasksParam;
 import com.tzld.piaoquan.content.understanding.service.ContentService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,15 +25,15 @@ public class ContentUnderstandingController {
     private ContentService contentService;
 
     @PostMapping(value = "/submitTasks")
-    public CommonResponse<TaskResultDTO> submitTasks(@RequestBody ContentUnderstandParam param) {
-        contentService.submitTasks(param);
-        return CommonResponse.create();
+    public CommonResponse<TaskResultDTO> submitTasks(@RequestBody SubmitTasksParam param) {
+        TaskResultDTO taskResultDTO = contentService.submitTasks(param);
+        return CommonResponse.create(taskResultDTO);
     }
 
     @PostMapping(value = "/queryTasks")
     public CommonResponse<TaskResultDTO> queryTasks(@RequestBody ContentUnderstandParam param) {
-        contentService.queryTasks(param);
-        return CommonResponse.create();
+        TaskResultDTO taskResultDTO = contentService.queryTasks(param);
+        return CommonResponse.create(taskResultDTO);
     }
 
 }