wangyunpeng il y a 20 heures
Parent
commit
b499737e39

+ 4 - 2
core/src/main/java/com/tzld/videoVector/dao/mapper/pgVector/ext/DeconstructVectorConfigMapperExt.java

@@ -1,9 +1,10 @@
 package com.tzld.videoVector.dao.mapper.pgVector.ext;
 package com.tzld.videoVector.dao.mapper.pgVector.ext;
 
 
 import com.tzld.videoVector.model.po.pgVector.DeconstructVectorConfig;
 import com.tzld.videoVector.model.po.pgVector.DeconstructVectorConfig;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import java.util.List;
+
 /**
 /**
  * DeconstructVectorConfig 自定义查询 Mapper(与 MBG 生成的基础 Mapper 分离)
  * DeconstructVectorConfig 自定义查询 Mapper(与 MBG 生成的基础 Mapper 分离)
  */
  */
@@ -14,5 +15,6 @@ public interface DeconstructVectorConfigMapperExt {
      */
      */
     List<DeconstructVectorConfig> selectMatchingConfigs(
     List<DeconstructVectorConfig> selectMatchingConfigs(
             @Param("bizType") Short bizType,
             @Param("bizType") Short bizType,
-            @Param("contentType") Short contentType);
+            @Param("contentType") Short contentType,
+            @Param("sourceField") String sourceField);
 }
 }

+ 2 - 1
core/src/main/java/com/tzld/videoVector/service/impl/VectorizeServiceImpl.java

@@ -41,7 +41,8 @@ public class VectorizeServiceImpl implements VectorizeService {
         // 使用 null-aware 查询:字段为 null(通用配置)和字段等于指定値的配置均可匹配
         // 使用 null-aware 查询:字段为 null(通用配置)和字段等于指定値的配置均可匹配
         return vectorConfigMapperExt.selectMatchingConfigs(
         return vectorConfigMapperExt.selectMatchingConfigs(
                 bizType != null ? bizType.shortValue() : null,
                 bizType != null ? bizType.shortValue() : null,
-                contentType != null ? contentType.shortValue() : null
+                contentType != null ? contentType.shortValue() : null,
+                "result_json"
         );
         );
     }
     }
 
 

+ 3 - 3
core/src/main/resources/mapper/pgVector/ext/DeconstructVectorConfigMapperExt.xml

@@ -14,12 +14,12 @@
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     FROM deconstruct_vector_config
     FROM deconstruct_vector_config
     WHERE enabled = 1
     WHERE enabled = 1
-    AND source_field = 'result_json'
+    AND source_field = #{sourceField}
     <if test="bizType != null">
     <if test="bizType != null">
-      AND (biz_type IS NULL OR biz_type = #{bizType,jdbcType=SMALLINT})
+      AND (biz_type IS NULL OR biz_type = #{bizType})
     </if>
     </if>
     <if test="contentType != null">
     <if test="contentType != null">
-      AND (content_type IS NULL OR content_type = #{contentType,jdbcType=SMALLINT})
+      AND (content_type IS NULL OR content_type = #{contentType})
     </if>
     </if>
     ORDER BY priority ASC
     ORDER BY priority ASC
   </select>
   </select>