Merge branch 'dev-volcengine' into develop

src/main/java/com/backendsys/modules/ai/volcengine/entity/VolcengineVideoTask.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.gson.annotations.JsonAdapter;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -86,4 +87,11 @@ public class VolcengineVideoTask {
     @TableField(exist = false)
     private Integer is_collect;
 
+    /**
+     * 用户id参数，用于分页查询
+     */
+    @TableField(exist = false)
+    @JsonIgnore
+    private Long param_user_id;
+
 }

src/main/resources/mapper/ai/volcengine/VolcengineVideoTaskDao.xml

@@ -46,12 +46,13 @@
         <result property="is_collect" column="is_collect" />
         <result property="create_time" column="create_time" typeHandler="com.backendsys.config.Mybatis.handler.timezone.LocalDateTimeHandler" />
         <result property="update_time" column="update_time" typeHandler="com.backendsys.config.Mybatis.handler.timezone.LocalDateTimeHandler" />
+        <result property="param_user_id" column="param_user_id"/>
     </resultMap>
 
     <!-- 任务映射 -->
     <resultMap id="resultMapTask" type="com.backendsys.modules.ai.volcengine.entity.VolcengineVideoTask" extends="baseTaskMap">
         <collection select="queryDetailById" property="detail_list" javaType="java.util.List"
-                    ofType="com.backendsys.modules.ai.volcengine.entity.VolcengineVideoTaskDetail" column="{id=id, user_id=user_id}">
+                    ofType="com.backendsys.modules.ai.volcengine.entity.VolcengineVideoTaskDetail" column="{id=id, param_user_id=param_user_id}">
             <id property="id" column="id" />
             <result property="user_id" column="user_id" />
             <result property="task_id" column="task_id" />
@@ -94,7 +95,8 @@
     <select id="selectTaskList" resultMap="resultMapTask">
         SELECT
             <include refid="includeVolcengineVideoTask" />
-            , IF(avc.task_id IS NOT NULL, 1, -1) AS is_collect
+            , IF(avc.task_id IS NOT NULL, 1, -1) AS is_collect,
+            #{dto.user_id} as param_user_id
         FROM ai_volcengine_video_task avvt
         LEFT JOIN (
             SELECT
@@ -125,7 +127,7 @@
         LEFT JOIN ai_volcengine_video_collect avc
             ON avc.task_id = avvtd.task_id
             AND avc.task_detail_id = avvtd.id
-            AND avc.user_id = #{user_id}
+            AND avc.user_id = #{param_user_id}
         WHERE avvtd.task_id = #{id}
         ORDER BY update_time DESC
     </select>