增加 泛化元素、泛化点类型

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

@@ -256,6 +256,8 @@ public class ContentPlatformDemandVideoJob {
                     demandVideo.setMatchExposurePv(videoItem.getLong("matchExposurePv"));
                     demandVideo.setMatchHeadSingleReturnRate(videoItem.getDouble("matchHeadSingleReturnRate"));
                     demandVideo.setMatchHeadDistributionSingleReturnRate(videoItem.getDouble("matchHeadDistributionSingleReturnRate"));
+                    demandVideo.setMatchGeneralizedElement(videoItem.getString("matchGeneralizedElement"));
+                    demandVideo.setMatchGeneralizedPointType(videoItem.getString("matchGeneralizedPointType"));
                     demandVideo.setStatus(1);
                     demandVideo.setCreateTimestamp(now);
                     if (Objects.isNull(demandVideo.getRov()) || demandVideo.getRov() == 0.0) {

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

@@ -45,6 +45,10 @@ public class ContentPlatformDemandVideo {
 
     private String standardElement;
 
+    private String matchGeneralizedElement;
+
+    private String matchGeneralizedPointType;
+
     private String elementDimension;
 
     private String categoryName;
@@ -279,6 +283,22 @@ public class ContentPlatformDemandVideo {
         this.standardElement = standardElement;
     }
 
+    public String getMatchGeneralizedElement() {
+        return matchGeneralizedElement;
+    }
+
+    public void setMatchGeneralizedElement(String matchGeneralizedElement) {
+        this.matchGeneralizedElement = matchGeneralizedElement;
+    }
+
+    public String getMatchGeneralizedPointType() {
+        return matchGeneralizedPointType;
+    }
+
+    public void setMatchGeneralizedPointType(String matchGeneralizedPointType) {
+        this.matchGeneralizedPointType = matchGeneralizedPointType;
+    }
+
     public String getElementDimension() {
         return elementDimension;
     }
@@ -539,6 +559,8 @@ public class ContentPlatformDemandVideo {
         sb.append(", demandContentTopic=").append(demandContentTopic);
         sb.append(", pointType=").append(pointType);
         sb.append(", standardElement=").append(standardElement);
+        sb.append(", matchGeneralizedElement=").append(matchGeneralizedElement);
+        sb.append(", matchGeneralizedPointType=").append(matchGeneralizedPointType);
         sb.append(", elementDimension=").append(elementDimension);
         sb.append(", categoryName=").append(categoryName);
         sb.append(", crowdCount=").append(crowdCount);

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

@@ -1645,6 +1645,146 @@ public class ContentPlatformDemandVideoExample {
             return (Criteria) this;
         }
 
+        public Criteria andMatchGeneralizedElementIsNull() {
+            addCriterion("match_generalized_element is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementIsNotNull() {
+            addCriterion("match_generalized_element is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementEqualTo(String value) {
+            addCriterion("match_generalized_element =", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementNotEqualTo(String value) {
+            addCriterion("match_generalized_element <>", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementGreaterThan(String value) {
+            addCriterion("match_generalized_element >", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementGreaterThanOrEqualTo(String value) {
+            addCriterion("match_generalized_element >=", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementLessThan(String value) {
+            addCriterion("match_generalized_element <", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementLessThanOrEqualTo(String value) {
+            addCriterion("match_generalized_element <=", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementLike(String value) {
+            addCriterion("match_generalized_element like", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementNotLike(String value) {
+            addCriterion("match_generalized_element not like", value, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementIn(List<String> values) {
+            addCriterion("match_generalized_element in", values, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementNotIn(List<String> values) {
+            addCriterion("match_generalized_element not in", values, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementBetween(String value1, String value2) {
+            addCriterion("match_generalized_element between", value1, value2, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedElementNotBetween(String value1, String value2) {
+            addCriterion("match_generalized_element not between", value1, value2, "matchGeneralizedElement");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeIsNull() {
+            addCriterion("match_generalized_point_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeIsNotNull() {
+            addCriterion("match_generalized_point_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeEqualTo(String value) {
+            addCriterion("match_generalized_point_type =", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeNotEqualTo(String value) {
+            addCriterion("match_generalized_point_type <>", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeGreaterThan(String value) {
+            addCriterion("match_generalized_point_type >", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("match_generalized_point_type >=", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeLessThan(String value) {
+            addCriterion("match_generalized_point_type <", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeLessThanOrEqualTo(String value) {
+            addCriterion("match_generalized_point_type <=", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeLike(String value) {
+            addCriterion("match_generalized_point_type like", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeNotLike(String value) {
+            addCriterion("match_generalized_point_type not like", value, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeIn(List<String> values) {
+            addCriterion("match_generalized_point_type in", values, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeNotIn(List<String> values) {
+            addCriterion("match_generalized_point_type not in", values, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeBetween(String value1, String value2) {
+            addCriterion("match_generalized_point_type between", value1, value2, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMatchGeneralizedPointTypeNotBetween(String value1, String value2) {
+            addCriterion("match_generalized_point_type not between", value1, value2, "matchGeneralizedPointType");
+            return (Criteria) this;
+        }
+
         public Criteria andElementDimensionIsNull() {
             addCriterion("element_dimension is null");
             return (Criteria) this;

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

@@ -24,6 +24,8 @@
     <result column="demand_content_topic" jdbcType="VARCHAR" property="demandContentTopic" />
     <result column="point_type" jdbcType="VARCHAR" property="pointType" />
     <result column="standard_element" jdbcType="VARCHAR" property="standardElement" />
+    <result column="match_generalized_element" jdbcType="VARCHAR" property="matchGeneralizedElement" />
+    <result column="match_generalized_point_type" jdbcType="VARCHAR" property="matchGeneralizedPointType" />
     <result column="element_dimension" jdbcType="VARCHAR" property="elementDimension" />
     <result column="category_name" jdbcType="VARCHAR" property="categoryName" />
     <result column="crowd_count" jdbcType="INTEGER" property="crowdCount" />
@@ -116,11 +118,12 @@
     id, dt, online_action, channel_name, crowd_segment, channel_level3, demand_id, crowd_package, 
     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, match_method, 
-    match_video_filter, match_sort, video_id, config_code, score, sim, rov, match_text, 
-    title, cover, video, experiment_id, scene_sum_rov, `status`, create_timestamp, update_timestamp, 
-    category, match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate
+    demand_content_topic, point_type, standard_element, match_generalized_element, match_generalized_point_type, 
+    element_dimension, category_name, 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, scene_sum_rov, `status`, 
+    create_timestamp, update_timestamp, category, match_exposure_pv, match_head_single_return_rate, 
+    match_head_distribution_single_return_rate
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformDemandVideoExample" resultMap="BaseResultMap">
     select
@@ -163,7 +166,8 @@
       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, 
+      point_type, standard_element, match_generalized_element, 
+      match_generalized_point_type, element_dimension, 
       category_name, crowd_count, video_count, 
       visit_uv, uv_ratio, total_rov, 
       match_experiment_id, match_method, match_video_filter, 
@@ -181,7 +185,8 @@
       #{demandStrategy,jdbcType=VARCHAR}, #{driveDimensionTime,jdbcType=VARCHAR}, #{dimension,jdbcType=VARCHAR}, 
       #{demandFilterSortStrategy,jdbcType=VARCHAR}, #{demandType,jdbcType=VARCHAR}, #{demandContentId,jdbcType=VARCHAR}, 
       #{demandContentTitle,jdbcType=VARCHAR}, #{demandContentTopic,jdbcType=VARCHAR}, 
-      #{pointType,jdbcType=VARCHAR}, #{standardElement,jdbcType=VARCHAR}, #{elementDimension,jdbcType=VARCHAR}, 
+      #{pointType,jdbcType=VARCHAR}, #{standardElement,jdbcType=VARCHAR}, #{matchGeneralizedElement,jdbcType=VARCHAR}, 
+      #{matchGeneralizedPointType,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}, #{matchMethod,jdbcType=VARCHAR}, #{matchVideoFilter,jdbcType=VARCHAR}, 
@@ -262,6 +267,12 @@
       <if test="standardElement != null">
         standard_element,
       </if>
+      <if test="matchGeneralizedElement != null">
+        match_generalized_element,
+      </if>
+      <if test="matchGeneralizedPointType != null">
+        match_generalized_point_type,
+      </if>
       <if test="elementDimension != null">
         element_dimension,
       </if>
@@ -417,6 +428,12 @@
       <if test="standardElement != null">
         #{standardElement,jdbcType=VARCHAR},
       </if>
+      <if test="matchGeneralizedElement != null">
+        #{matchGeneralizedElement,jdbcType=VARCHAR},
+      </if>
+      <if test="matchGeneralizedPointType != null">
+        #{matchGeneralizedPointType,jdbcType=VARCHAR},
+      </if>
       <if test="elementDimension != null">
         #{elementDimension,jdbcType=VARCHAR},
       </if>
@@ -581,6 +598,12 @@
       <if test="record.standardElement != null">
         standard_element = #{record.standardElement,jdbcType=VARCHAR},
       </if>
+      <if test="record.matchGeneralizedElement != null">
+        match_generalized_element = #{record.matchGeneralizedElement,jdbcType=VARCHAR},
+      </if>
+      <if test="record.matchGeneralizedPointType != null">
+        match_generalized_point_type = #{record.matchGeneralizedPointType,jdbcType=VARCHAR},
+      </if>
       <if test="record.elementDimension != null">
         element_dimension = #{record.elementDimension,jdbcType=VARCHAR},
       </if>
@@ -697,6 +720,8 @@
       demand_content_topic = #{record.demandContentTopic,jdbcType=VARCHAR},
       point_type = #{record.pointType,jdbcType=VARCHAR},
       standard_element = #{record.standardElement,jdbcType=VARCHAR},
+      match_generalized_element = #{record.matchGeneralizedElement,jdbcType=VARCHAR},
+      match_generalized_point_type = #{record.matchGeneralizedPointType,jdbcType=VARCHAR},
       element_dimension = #{record.elementDimension,jdbcType=VARCHAR},
       category_name = #{record.categoryName,jdbcType=VARCHAR},
       crowd_count = #{record.crowdCount,jdbcType=INTEGER},
@@ -796,6 +821,12 @@
       <if test="standardElement != null">
         standard_element = #{standardElement,jdbcType=VARCHAR},
       </if>
+      <if test="matchGeneralizedElement != null">
+        match_generalized_element = #{matchGeneralizedElement,jdbcType=VARCHAR},
+      </if>
+      <if test="matchGeneralizedPointType != null">
+        match_generalized_point_type = #{matchGeneralizedPointType,jdbcType=VARCHAR},
+      </if>
       <if test="elementDimension != null">
         element_dimension = #{elementDimension,jdbcType=VARCHAR},
       </if>
@@ -909,6 +940,8 @@
       demand_content_topic = #{demandContentTopic,jdbcType=VARCHAR},
       point_type = #{pointType,jdbcType=VARCHAR},
       standard_element = #{standardElement,jdbcType=VARCHAR},
+      match_generalized_element = #{matchGeneralizedElement,jdbcType=VARCHAR},
+      match_generalized_point_type = #{matchGeneralizedPointType,jdbcType=VARCHAR},
       element_dimension = #{elementDimension,jdbcType=VARCHAR},
       category_name = #{categoryName,jdbcType=VARCHAR},
       crowd_count = #{crowdCount,jdbcType=INTEGER},

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

@@ -11,7 +11,8 @@
         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, scene_sum_rov,
         channel_level3, status, create_timestamp, update_timestamp,
-        match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate)
+        match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate,
+        match_generalized_element, match_generalized_point_type)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.dt}, #{item.channelName}, #{item.crowdSegment}, #{item.dimension}, #{item.pointType},
@@ -24,7 +25,8 @@
             #{item.videoId}, #{item.configCode}, #{item.score}, #{item.sim}, #{item.rov},
             #{item.matchText}, #{item.title}, #{item.cover}, #{item.video}, #{item.experimentId}, #{item.sceneSumRov},
             #{item.channelLevel3}, #{item.status}, #{item.createTimestamp}, #{item.updateTimestamp},
-            #{item.matchExposurePv}, #{item.matchHeadSingleReturnRate}, #{item.matchHeadDistributionSingleReturnRate})
+            #{item.matchExposurePv}, #{item.matchHeadSingleReturnRate}, #{item.matchHeadDistributionSingleReturnRate},
+            #{item.matchGeneralizedElement}, #{item.matchGeneralizedPointType})
         </foreach>
     </insert>
 
@@ -49,7 +51,8 @@
                match_method, match_video_filter, match_sort,
                video_id, config_code, score, sim, rov,
                match_text, title, cover, video, experiment_id, scene_sum_rov, channel_level3, status, create_timestamp, update_timestamp,
-               match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate
+               match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate,
+               match_generalized_element, match_generalized_point_type
         FROM content_platform_demand_video
         WHERE dt = #{dt} AND status = 1
         <if test="channelName != null and channelName != ''">
@@ -112,7 +115,8 @@
                match_method, match_video_filter, match_sort,
                video_id, config_code, score, sim, rov,
                match_text, title, cover, video, experiment_id, scene_sum_rov, status, create_timestamp, update_timestamp,
-               match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate
+               match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate,
+               match_generalized_element, match_generalized_point_type
         FROM content_platform_demand_video
         WHERE dt = #{dt} AND status = 1
         <if test="excludeCategories != null and excludeCategories.size() > 0">
@@ -178,7 +182,8 @@
                match_method, match_video_filter, match_sort,
                video_id, config_code, score, sim, rov,
                match_text, title, cover, video, experiment_id, scene_sum_rov, status, create_timestamp, update_timestamp,
-               match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate
+               match_exposure_pv, match_head_single_return_rate, match_head_distribution_single_return_rate,
+               match_generalized_element, match_generalized_point_type
         FROM content_platform_demand_video
         WHERE dt = #{dt} AND status = 1
           AND channel_name = #{channelName}