Merge branch '20260520-wyp-demandVideo'

api-module/src/main/java/com/tzld/piaoquan/api/job/contentplatform/ContentPlatformDemandVideoJob.java

@@ -46,6 +46,9 @@ public class ContentPlatformDemandVideoJob {
     @ApolloJsonValue("${sync.channel.names:[\"公众号合作-即转-稳定\",\"群/企微合作-稳定\",\"公众号合作-Daily-自选\"]}")
     private List<String> syncChannelNames;
 
+    /** 默认记录所属 channel_name 标记,用于与正常渠道数据隔离,便于幂等清理 */
+    private static final String DEFAULT_RECORD_CHANNEL = "default";
+
     @XxlJob("syncContentPlatformDemandVideoJob")
     public ReturnT<String> syncContentPlatformDemandVideoJob(String param) {
         String dt = DateUtil.getBeforeDayDateString("yyyyMMdd");
@@ -63,10 +66,53 @@ public class ContentPlatformDemandVideoJob {
             }
         }
 
+        try {
+            insertDefaultRecords(dt);
+        } catch (Exception e) {
+            log.error("syncContentPlatformDemandVideoJob insertDefaultRecords error, dt={}", dt, e);
+            return ReturnT.FAIL;
+        }
+
         log.info("syncContentPlatformDemandVideoJob finish, dt={}", dt);
         return ReturnT.SUCCESS;
     }
 
+    /**
+     * 写入三条默认记录:仅含匹配实验id及三个匹配相关字段,其它字段为空。
+     * 用 channel_name=DEFAULT_RECORD_CHANNEL 与正常渠道数据隔离,先按 (dt, channel_name) 删除后批量插入,保证幂等。
+     */
+    private void insertDefaultRecords(String dt) {
+        Long now = System.currentTimeMillis();
+        List<ContentPlatformDemandVideo> defaults = new ArrayList<>();
+        defaults.add(buildDefaultRecord(dt, now,
+                "vector_search", "向量搜索", "相似度>=0.8", "视频综合得分（相似性|rov）倒序"));
+        defaults.add(buildDefaultRecord(dt, now,
+                "manager_search", "后台搜索", "关键词匹配", "--"));
+        defaults.add(buildDefaultRecord(dt, now,
+                "hot", "票圈热门", "--", "视频综合加权得分（rov*时间）倒序"));
+
+        demandVideoMapperExt.deleteByDtAndChannelName(dt, DEFAULT_RECORD_CHANNEL);
+        demandVideoMapperExt.batchInsert(defaults);
+        log.info("insertDefaultRecords success, dt={}, count={}", dt, defaults.size());
+    }
+
+    private ContentPlatformDemandVideo buildDefaultRecord(String dt, Long now,
+                                                          String matchExperimentId,
+                                                          String matchMethod,
+                                                          String matchVideoFilter,
+                                                          String matchSort) {
+        ContentPlatformDemandVideo record = new ContentPlatformDemandVideo();
+        record.setDt(dt);
+        record.setChannelName(DEFAULT_RECORD_CHANNEL);
+        record.setMatchExperimentId(matchExperimentId);
+        record.setMatchMethod(matchMethod);
+        record.setMatchVideoFilter(matchVideoFilter);
+        record.setMatchSort(matchSort);
+        record.setStatus(1);
+        record.setCreateTimestamp(now);
+        return record;
+    }
+
     private static final int PAGE_SIZE = 10000;
 
     private void syncByChannel(String dt, String syncChannelName) throws Exception {
@@ -140,6 +186,9 @@ public class ContentPlatformDemandVideoJob {
                 Double totalRov = demandItem.getDouble("totalRov");
                 String onlineAction = demandItem.getString("onlineAction");
                 String channelLevel3 = demandItem.getString("channelLevel3");
+                String matchMethod = demandItem.getString("matchMethod");
+                String matchVideoFilter = demandItem.getString("matchVideoFilter");
+                String matchSort = demandItem.getString("matchSort");
 
                 JSONArray matchedVideos = demandItem.getJSONArray("matchedVideos");
                 if (matchedVideos == null || matchedVideos.isEmpty()) {
@@ -177,6 +226,9 @@ public class ContentPlatformDemandVideoJob {
                     demandVideo.setTotalRov(totalRov);
                     demandVideo.setOnlineAction(onlineAction != null ? onlineAction : "");
                     demandVideo.setChannelLevel3(channelLevel3 != null ? channelLevel3 : "");
+                    demandVideo.setMatchMethod(matchMethod != null ? matchMethod : "");
+                    demandVideo.setMatchVideoFilter(matchVideoFilter != null ? matchVideoFilter : "");
+                    demandVideo.setMatchSort(matchSort != null ? matchSort : "");
                     demandVideo.setVideoId(videoItem.getLong("videoId"));
                     demandVideo.setConfigCode(videoItem.getString("configCode") != null ? videoItem.getString("configCode") : "");
                     demandVideo.setScore(videoItem.getDouble("score"));

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformDemandVideo.java

@@ -9,10 +9,10 @@ public class ContentPlatformDemandVideo {
 
     private String channelName;
 
-    private String channelLevel3;
-
     private String crowdSegment;
 
+    private String channelLevel3;
+
     private String demandId;
 
     private String crowdPackage;
@@ -49,8 +49,6 @@ public class ContentPlatformDemandVideo {
 
     private String categoryName;
 
-    private String category;
-
     private Integer crowdCount;
 
     private Integer videoCount;
@@ -63,6 +61,12 @@ public class ContentPlatformDemandVideo {
 
     private String matchExperimentId;
 
+    private String matchMethod;
+
+    private String matchVideoFilter;
+
+    private String matchSort;
+
     private Long videoId;
 
     private String configCode;
@@ -89,6 +93,8 @@ public class ContentPlatformDemandVideo {
 
     private Long updateTimestamp;
 
+    private String category;
+
     public Long getId() {
         return id;
     }
@@ -121,14 +127,6 @@ public class ContentPlatformDemandVideo {
         this.channelName = channelName;
     }
 
-    public String getChannelLevel3() {
-        return channelLevel3;
-    }
-
-    public void setChannelLevel3(String channelLevel3) {
-        this.channelLevel3 = channelLevel3;
-    }
-
     public String getCrowdSegment() {
         return crowdSegment;
     }
@@ -137,6 +135,14 @@ public class ContentPlatformDemandVideo {
         this.crowdSegment = crowdSegment;
     }
 
+    public String getChannelLevel3() {
+        return channelLevel3;
+    }
+
+    public void setChannelLevel3(String channelLevel3) {
+        this.channelLevel3 = channelLevel3;
+    }
+
     public String getDemandId() {
         return demandId;
     }
@@ -281,14 +287,6 @@ public class ContentPlatformDemandVideo {
         this.categoryName = categoryName;
     }
 
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
     public Integer getCrowdCount() {
         return crowdCount;
     }
@@ -337,6 +335,30 @@ public class ContentPlatformDemandVideo {
         this.matchExperimentId = matchExperimentId;
     }
 
+    public String getMatchMethod() {
+        return matchMethod;
+    }
+
+    public void setMatchMethod(String matchMethod) {
+        this.matchMethod = matchMethod;
+    }
+
+    public String getMatchVideoFilter() {
+        return matchVideoFilter;
+    }
+
+    public void setMatchVideoFilter(String matchVideoFilter) {
+        this.matchVideoFilter = matchVideoFilter;
+    }
+
+    public String getMatchSort() {
+        return matchSort;
+    }
+
+    public void setMatchSort(String matchSort) {
+        this.matchSort = matchSort;
+    }
+
     public Long getVideoId() {
         return videoId;
     }
@@ -441,6 +463,14 @@ public class ContentPlatformDemandVideo {
         this.updateTimestamp = updateTimestamp;
     }
 
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -471,13 +501,15 @@ public class ContentPlatformDemandVideo {
         sb.append(", standardElement=").append(standardElement);
         sb.append(", elementDimension=").append(elementDimension);
         sb.append(", categoryName=").append(categoryName);
-        sb.append(", category=").append(category);
         sb.append(", crowdCount=").append(crowdCount);
         sb.append(", videoCount=").append(videoCount);
         sb.append(", visitUv=").append(visitUv);
         sb.append(", uvRatio=").append(uvRatio);
         sb.append(", totalRov=").append(totalRov);
         sb.append(", matchExperimentId=").append(matchExperimentId);
+        sb.append(", matchMethod=").append(matchMethod);
+        sb.append(", matchVideoFilter=").append(matchVideoFilter);
+        sb.append(", matchSort=").append(matchSort);
         sb.append(", videoId=").append(videoId);
         sb.append(", configCode=").append(configCode);
         sb.append(", score=").append(score);
@@ -491,6 +523,7 @@ public class ContentPlatformDemandVideo {
         sb.append(", status=").append(status);
         sb.append(", createTimestamp=").append(createTimestamp);
         sb.append(", updateTimestamp=").append(updateTimestamp);
+        sb.append(", category=").append(category);
         sb.append("]");
         return sb.toString();
     }

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformDemandVideoExample.java

@@ -2155,6 +2155,216 @@ public class ContentPlatformDemandVideoExample {
             return (Criteria) this;
         }
 
+        public Criteria andMatchMethodIsNull() {
+            addCriterion("match_method is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodIsNotNull() {
+            addCriterion("match_method is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodEqualTo(String value) {
+            addCriterion("match_method =", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodNotEqualTo(String value) {
+            addCriterion("match_method <>", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodGreaterThan(String value) {
+            addCriterion("match_method >", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodGreaterThanOrEqualTo(String value) {
+            addCriterion("match_method >=", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodLessThan(String value) {
+            addCriterion("match_method <", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodLessThanOrEqualTo(String value) {
+            addCriterion("match_method <=", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodLike(String value) {
+            addCriterion("match_method like", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodNotLike(String value) {
+            addCriterion("match_method not like", value, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodIn(List<String> values) {
+            addCriterion("match_method in", values, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodNotIn(List<String> values) {
+            addCriterion("match_method not in", values, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodBetween(String value1, String value2) {
+            addCriterion("match_method between", value1, value2, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchMethodNotBetween(String value1, String value2) {
+            addCriterion("match_method not between", value1, value2, "matchMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterIsNull() {
+            addCriterion("match_video_filter is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterIsNotNull() {
+            addCriterion("match_video_filter is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterEqualTo(String value) {
+            addCriterion("match_video_filter =", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterNotEqualTo(String value) {
+            addCriterion("match_video_filter <>", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterGreaterThan(String value) {
+            addCriterion("match_video_filter >", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterGreaterThanOrEqualTo(String value) {
+            addCriterion("match_video_filter >=", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterLessThan(String value) {
+            addCriterion("match_video_filter <", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterLessThanOrEqualTo(String value) {
+            addCriterion("match_video_filter <=", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterLike(String value) {
+            addCriterion("match_video_filter like", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterNotLike(String value) {
+            addCriterion("match_video_filter not like", value, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterIn(List<String> values) {
+            addCriterion("match_video_filter in", values, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterNotIn(List<String> values) {
+            addCriterion("match_video_filter not in", values, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterBetween(String value1, String value2) {
+            addCriterion("match_video_filter between", value1, value2, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchVideoFilterNotBetween(String value1, String value2) {
+            addCriterion("match_video_filter not between", value1, value2, "matchVideoFilter");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortIsNull() {
+            addCriterion("match_sort is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortIsNotNull() {
+            addCriterion("match_sort is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortEqualTo(String value) {
+            addCriterion("match_sort =", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortNotEqualTo(String value) {
+            addCriterion("match_sort <>", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortGreaterThan(String value) {
+            addCriterion("match_sort >", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortGreaterThanOrEqualTo(String value) {
+            addCriterion("match_sort >=", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortLessThan(String value) {
+            addCriterion("match_sort <", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortLessThanOrEqualTo(String value) {
+            addCriterion("match_sort <=", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortLike(String value) {
+            addCriterion("match_sort like", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortNotLike(String value) {
+            addCriterion("match_sort not like", value, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortIn(List<String> values) {
+            addCriterion("match_sort in", values, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortNotIn(List<String> values) {
+            addCriterion("match_sort not in", values, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortBetween(String value1, String value2) {
+            addCriterion("match_sort between", value1, value2, "matchSort");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchSortNotBetween(String value1, String value2) {
+            addCriterion("match_sort not between", value1, value2, "matchSort");
+            return (Criteria) this;
+        }
+
         public Criteria andVideoIdIsNull() {
             addCriterion("video_id is null");
             return (Criteria) this;
@@ -2994,6 +3204,76 @@ public class ContentPlatformDemandVideoExample {
             addCriterion("update_timestamp not between", value1, value2, "updateTimestamp");
             return (Criteria) this;
         }
+
+        public Criteria andCategoryIsNull() {
+            addCriterion("category is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIsNotNull() {
+            addCriterion("category is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryEqualTo(String value) {
+            addCriterion("category =", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotEqualTo(String value) {
+            addCriterion("category <>", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThan(String value) {
+            addCriterion("category >", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThanOrEqualTo(String value) {
+            addCriterion("category >=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThan(String value) {
+            addCriterion("category <", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThanOrEqualTo(String value) {
+            addCriterion("category <=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLike(String value) {
+            addCriterion("category like", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotLike(String value) {
+            addCriterion("category not like", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIn(List<String> values) {
+            addCriterion("category in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotIn(List<String> values) {
+            addCriterion("category not in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryBetween(String value1, String value2) {
+            addCriterion("category between", value1, value2, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotBetween(String value1, String value2) {
+            addCriterion("category not between", value1, value2, "category");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

api-module/src/main/resources/mapper/contentplatform/ContentPlatformDemandVideoMapper.xml

@@ -26,13 +26,15 @@
     <result column="standard_element" jdbcType="VARCHAR" property="standardElement" />
     <result column="element_dimension" jdbcType="VARCHAR" property="elementDimension" />
     <result column="category_name" jdbcType="VARCHAR" property="categoryName" />
-    <result column="category" jdbcType="VARCHAR" property="category" />
     <result column="crowd_count" jdbcType="INTEGER" property="crowdCount" />
     <result column="video_count" jdbcType="INTEGER" property="videoCount" />
     <result column="visit_uv" jdbcType="BIGINT" property="visitUv" />
     <result column="uv_ratio" jdbcType="DOUBLE" property="uvRatio" />
     <result column="total_rov" jdbcType="DOUBLE" property="totalRov" />
     <result column="match_experiment_id" jdbcType="VARCHAR" property="matchExperimentId" />
+    <result column="match_method" jdbcType="VARCHAR" property="matchMethod" />
+    <result column="match_video_filter" jdbcType="VARCHAR" property="matchVideoFilter" />
+    <result column="match_sort" jdbcType="VARCHAR" property="matchSort" />
     <result column="video_id" jdbcType="BIGINT" property="videoId" />
     <result column="config_code" jdbcType="VARCHAR" property="configCode" />
     <result column="score" jdbcType="DOUBLE" property="score" />
@@ -46,6 +48,7 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_timestamp" jdbcType="BIGINT" property="createTimestamp" />
     <result column="update_timestamp" jdbcType="BIGINT" property="updateTimestamp" />
+    <result column="category" jdbcType="VARCHAR" property="category" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -110,9 +113,10 @@
     conversion_target, partner, account, scene_value, demand_strategy, drive_dimension_time, 
     dimension, demand_filter_sort_strategy, demand_type, demand_content_id, demand_content_title, 
     demand_content_topic, point_type, standard_element, element_dimension, category_name, 
-    crowd_count, video_count, visit_uv, uv_ratio, total_rov, match_experiment_id, video_id, 
-    config_code, score, sim, rov, match_text, title, cover, video, experiment_id, `status`, 
-    create_timestamp, update_timestamp
+    crowd_count, video_count, visit_uv, uv_ratio, total_rov, match_experiment_id, match_method, 
+    match_video_filter, match_sort, video_id, config_code, score, sim, rov, match_text, 
+    title, cover, video, experiment_id, `status`, create_timestamp, update_timestamp, 
+    category
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformDemandVideoExample" resultMap="BaseResultMap">
     select
@@ -158,11 +162,12 @@
       point_type, standard_element, element_dimension, 
       category_name, crowd_count, video_count, 
       visit_uv, uv_ratio, total_rov, 
-      match_experiment_id, video_id, config_code, 
+      match_experiment_id, match_method, match_video_filter, 
+      match_sort, video_id, config_code, 
       score, sim, rov, match_text, 
       title, cover, video, 
       experiment_id, `status`, create_timestamp, 
-      update_timestamp)
+      update_timestamp, category)
     values (#{id,jdbcType=BIGINT}, #{dt,jdbcType=VARCHAR}, #{onlineAction,jdbcType=VARCHAR}, 
       #{channelName,jdbcType=VARCHAR}, #{crowdSegment,jdbcType=VARCHAR}, #{channelLevel3,jdbcType=VARCHAR}, 
       #{demandId,jdbcType=VARCHAR}, #{crowdPackage,jdbcType=VARCHAR}, #{conversionTarget,jdbcType=VARCHAR}, 
@@ -173,11 +178,12 @@
       #{pointType,jdbcType=VARCHAR}, #{standardElement,jdbcType=VARCHAR}, #{elementDimension,jdbcType=VARCHAR}, 
       #{categoryName,jdbcType=VARCHAR}, #{crowdCount,jdbcType=INTEGER}, #{videoCount,jdbcType=INTEGER}, 
       #{visitUv,jdbcType=BIGINT}, #{uvRatio,jdbcType=DOUBLE}, #{totalRov,jdbcType=DOUBLE}, 
-      #{matchExperimentId,jdbcType=VARCHAR}, #{videoId,jdbcType=BIGINT}, #{configCode,jdbcType=VARCHAR}, 
+      #{matchExperimentId,jdbcType=VARCHAR}, #{matchMethod,jdbcType=VARCHAR}, #{matchVideoFilter,jdbcType=VARCHAR}, 
+      #{matchSort,jdbcType=VARCHAR}, #{videoId,jdbcType=BIGINT}, #{configCode,jdbcType=VARCHAR}, 
       #{score,jdbcType=DOUBLE}, #{sim,jdbcType=DOUBLE}, #{rov,jdbcType=DOUBLE}, #{matchText,jdbcType=VARCHAR}, 
       #{title,jdbcType=VARCHAR}, #{cover,jdbcType=VARCHAR}, #{video,jdbcType=VARCHAR}, 
       #{experimentId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTimestamp,jdbcType=BIGINT}, 
-      #{updateTimestamp,jdbcType=BIGINT})
+      #{updateTimestamp,jdbcType=BIGINT}, #{category,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformDemandVideo">
     insert into content_platform_demand_video
@@ -272,6 +278,15 @@
       <if test="matchExperimentId != null">
         match_experiment_id,
       </if>
+      <if test="matchMethod != null">
+        match_method,
+      </if>
+      <if test="matchVideoFilter != null">
+        match_video_filter,
+      </if>
+      <if test="matchSort != null">
+        match_sort,
+      </if>
       <if test="videoId != null">
         video_id,
       </if>
@@ -311,6 +326,9 @@
       <if test="updateTimestamp != null">
         update_timestamp,
       </if>
+      <if test="category != null">
+        category,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -403,6 +421,15 @@
       <if test="matchExperimentId != null">
         #{matchExperimentId,jdbcType=VARCHAR},
       </if>
+      <if test="matchMethod != null">
+        #{matchMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="matchVideoFilter != null">
+        #{matchVideoFilter,jdbcType=VARCHAR},
+      </if>
+      <if test="matchSort != null">
+        #{matchSort,jdbcType=VARCHAR},
+      </if>
       <if test="videoId != null">
         #{videoId,jdbcType=BIGINT},
       </if>
@@ -442,6 +469,9 @@
       <if test="updateTimestamp != null">
         #{updateTimestamp,jdbcType=BIGINT},
       </if>
+      <if test="category != null">
+        #{category,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformDemandVideoExample" resultType="java.lang.Long">
@@ -543,6 +573,15 @@
       <if test="record.matchExperimentId != null">
         match_experiment_id = #{record.matchExperimentId,jdbcType=VARCHAR},
       </if>
+      <if test="record.matchMethod != null">
+        match_method = #{record.matchMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="record.matchVideoFilter != null">
+        match_video_filter = #{record.matchVideoFilter,jdbcType=VARCHAR},
+      </if>
+      <if test="record.matchSort != null">
+        match_sort = #{record.matchSort,jdbcType=VARCHAR},
+      </if>
       <if test="record.videoId != null">
         video_id = #{record.videoId,jdbcType=BIGINT},
       </if>
@@ -582,6 +621,9 @@
       <if test="record.updateTimestamp != null">
         update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
       </if>
+      <if test="record.category != null">
+        category = #{record.category,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -619,6 +661,9 @@
       uv_ratio = #{record.uvRatio,jdbcType=DOUBLE},
       total_rov = #{record.totalRov,jdbcType=DOUBLE},
       match_experiment_id = #{record.matchExperimentId,jdbcType=VARCHAR},
+      match_method = #{record.matchMethod,jdbcType=VARCHAR},
+      match_video_filter = #{record.matchVideoFilter,jdbcType=VARCHAR},
+      match_sort = #{record.matchSort,jdbcType=VARCHAR},
       video_id = #{record.videoId,jdbcType=BIGINT},
       config_code = #{record.configCode,jdbcType=VARCHAR},
       score = #{record.score,jdbcType=DOUBLE},
@@ -631,7 +676,8 @@
       experiment_id = #{record.experimentId,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
-      update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT}
+      update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
+      category = #{record.category,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -726,6 +772,15 @@
       <if test="matchExperimentId != null">
         match_experiment_id = #{matchExperimentId,jdbcType=VARCHAR},
       </if>
+      <if test="matchMethod != null">
+        match_method = #{matchMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="matchVideoFilter != null">
+        match_video_filter = #{matchVideoFilter,jdbcType=VARCHAR},
+      </if>
+      <if test="matchSort != null">
+        match_sort = #{matchSort,jdbcType=VARCHAR},
+      </if>
       <if test="videoId != null">
         video_id = #{videoId,jdbcType=BIGINT},
       </if>
@@ -765,6 +820,9 @@
       <if test="updateTimestamp != null">
         update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
       </if>
+      <if test="category != null">
+        category = #{category,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -799,6 +857,9 @@
       uv_ratio = #{uvRatio,jdbcType=DOUBLE},
       total_rov = #{totalRov,jdbcType=DOUBLE},
       match_experiment_id = #{matchExperimentId,jdbcType=VARCHAR},
+      match_method = #{matchMethod,jdbcType=VARCHAR},
+      match_video_filter = #{matchVideoFilter,jdbcType=VARCHAR},
+      match_sort = #{matchSort,jdbcType=VARCHAR},
       video_id = #{videoId,jdbcType=BIGINT},
       config_code = #{configCode,jdbcType=VARCHAR},
       score = #{score,jdbcType=DOUBLE},
@@ -811,7 +872,8 @@
       experiment_id = #{experimentId,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       create_timestamp = #{createTimestamp,jdbcType=BIGINT},
-      update_timestamp = #{updateTimestamp,jdbcType=BIGINT}
+      update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
+      category = #{category,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

api-module/src/main/resources/mapper/contentplatform/ext/ContentPlatformDemandVideoMapperExt.xml

@@ -9,6 +9,7 @@
          demand_strategy, drive_dimension_time, demand_filter_sort_strategy, demand_type,
          demand_content_id, demand_content_title, demand_content_topic,
          crowd_count, video_count, visit_uv, uv_ratio, total_rov, online_action, match_experiment_id,
+         match_method, match_video_filter, match_sort,
          video_id, config_code, score, sim, rov,
          match_text, title, cover, video, experiment_id, channel_level3, status, create_timestamp, update_timestamp)
         VALUES
@@ -18,6 +19,7 @@
              #{item.demandStrategy}, #{item.driveDimensionTime}, #{item.demandFilterSortStrategy}, #{item.demandType},
              #{item.demandContentId}, #{item.demandContentTitle}, #{item.demandContentTopic},
              #{item.crowdCount}, #{item.videoCount}, #{item.visitUv}, #{item.uvRatio}, #{item.totalRov}, #{item.onlineAction}, #{item.matchExperimentId},
+             #{item.matchMethod}, #{item.matchVideoFilter}, #{item.matchSort},
              #{item.videoId}, #{item.configCode}, #{item.score}, #{item.sim}, #{item.rov},
              #{item.matchText}, #{item.title}, #{item.cover}, #{item.video}, #{item.experimentId}, #{item.channelLevel3}, #{item.status}, #{item.createTimestamp}, #{item.updateTimestamp})
         </foreach>
@@ -37,6 +39,7 @@
                demand_strategy, drive_dimension_time, demand_filter_sort_strategy, demand_type,
                demand_content_id, demand_content_title, demand_content_topic,
                crowd_count, video_count, visit_uv, uv_ratio, total_rov, online_action, match_experiment_id,
+               match_method, match_video_filter, match_sort,
                video_id, config_code, score, sim, rov,
                match_text, title, cover, video, experiment_id, channel_level3, status, create_timestamp, update_timestamp
         FROM content_platform_demand_video
@@ -84,6 +87,7 @@
                demand_strategy, drive_dimension_time, demand_filter_sort_strategy, demand_type,
                demand_content_id, demand_content_title, demand_content_topic,
                crowd_count, video_count, visit_uv, uv_ratio, total_rov, online_action, match_experiment_id,
+               match_method, match_video_filter, match_sort,
                video_id, config_code, score, sim, rov,
                match_text, title, cover, video, experiment_id, status, create_timestamp, update_timestamp
         FROM content_platform_demand_video