增加三级渠道

core/src/main/java/com/tzld/videoVector/job/ChannelDemandMatchJob.java

@@ -156,6 +156,7 @@ public class ChannelDemandMatchJob {
                 result.setPointType(record.getString("需求特征点类型"));
                 result.setStandardElement(record.getString("需求特征点"));
                 result.setCategoryName(record.getString("需求特征类"));
+                result.setChannelLevel3(record.getString("三级渠道"));
 
                 // 统计指标
                 Double crowdCount = safeGetDouble(record, "人群总数量");
@@ -320,6 +321,7 @@ public class ChannelDemandMatchJob {
         fullKey.append("|").append(nullToEmpty(demand.getPointType()));
         fullKey.append("|").append(nullToEmpty(demand.getStandardElement()));
         fullKey.append("|").append(nullToEmpty(demand.getCategoryName()));
+        fullKey.append("|").append(nullToEmpty(demand.getChannelLevel3()));
         fullKey.append("|").append(matchVideoId);
         fullKey.append("|").append(nullToEmpty(matchConfigCode));
         String hash = Md5Util.encoderByMd5(fullKey.toString());
@@ -358,6 +360,7 @@ public class ChannelDemandMatchJob {
         row.setPointType(demand.getPointType());
         row.setStandardElement(demand.getStandardElement());
         row.setCategoryName(demand.getCategoryName());
+        row.setChannelLevel3(demand.getChannelLevel3());
         row.setCrowdCount(demand.getCrowdCount());
         row.setVisitUv(demand.getVisitUv());
         row.setUvRatio(demand.getUvRatio());
@@ -400,6 +403,7 @@ public class ChannelDemandMatchJob {
         sb.append(",需求特征点");
         sb.append(",需求特征点类型");
         sb.append(",需求特征类");
+        sb.append(",三级渠道");
         sb.append(",round(人群总数量, 0) as 人群总数量");
         sb.append(",群体访问uv");
         sb.append(",uv占比");

core/src/main/java/com/tzld/videoVector/model/po/pgVector/ChannelDemandMatchResult.java

@@ -437,6 +437,17 @@ public class ChannelDemandMatchResult {
      */
     private String experimentId;
 
+    /**
+     * Database Column Remarks:
+     *   三级渠道
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_demand_match_result.channel_level3
+     *
+     * @mbg.generated
+     */
+    private String channelLevel3;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column channel_demand_match_result.id
@@ -1373,6 +1384,30 @@ public class ChannelDemandMatchResult {
         this.experimentId = experimentId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_demand_match_result.channel_level3
+     *
+     * @return the value of channel_demand_match_result.channel_level3
+     *
+     * @mbg.generated
+     */
+    public String getChannelLevel3() {
+        return channelLevel3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_demand_match_result.channel_level3
+     *
+     * @param channelLevel3 the value for channel_demand_match_result.channel_level3
+     *
+     * @mbg.generated
+     */
+    public void setChannelLevel3(String channelLevel3) {
+        this.channelLevel3 = channelLevel3;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table channel_demand_match_result
@@ -1424,6 +1459,7 @@ public class ChannelDemandMatchResult {
         sb.append(", demandContentTopic=").append(demandContentTopic);
         sb.append(", uvRatio=").append(uvRatio);
         sb.append(", experimentId=").append(experimentId);
+        sb.append(", channelLevel3=").append(channelLevel3);
         sb.append("]");
         return sb.toString();
     }

core/src/main/java/com/tzld/videoVector/model/po/pgVector/ChannelDemandMatchResultExample.java

@@ -2784,6 +2784,76 @@ public class ChannelDemandMatchResultExample {
             addCriterion("experiment_id not between", value1, value2, "experimentId");
             return (Criteria) this;
         }
+
+        public Criteria andChannelLevel3IsNull() {
+            addCriterion("channel_level3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3IsNotNull() {
+            addCriterion("channel_level3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3EqualTo(String value) {
+            addCriterion("channel_level3 =", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3NotEqualTo(String value) {
+            addCriterion("channel_level3 <>", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3GreaterThan(String value) {
+            addCriterion("channel_level3 >", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3GreaterThanOrEqualTo(String value) {
+            addCriterion("channel_level3 >=", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3LessThan(String value) {
+            addCriterion("channel_level3 <", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3LessThanOrEqualTo(String value) {
+            addCriterion("channel_level3 <=", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3Like(String value) {
+            addCriterion("channel_level3 like", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3NotLike(String value) {
+            addCriterion("channel_level3 not like", value, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3In(List<String> values) {
+            addCriterion("channel_level3 in", values, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3NotIn(List<String> values) {
+            addCriterion("channel_level3 not in", values, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3Between(String value1, String value2) {
+            addCriterion("channel_level3 between", value1, value2, "channelLevel3");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLevel3NotBetween(String value1, String value2) {
+            addCriterion("channel_level3 not between", value1, value2, "channelLevel3");
+            return (Criteria) this;
+        }
     }
 
     /**

core/src/main/java/com/tzld/videoVector/model/vo/ChannelDemandMatchVO.java

@@ -88,6 +88,9 @@ public class ChannelDemandMatchVO {
     /** 线上应用动作 */
     private String onlineAction;
 
+    /** 三级渠道 */
+    private String channelLevel3;
+
     /** 匹配到的视频列表 */
     private List<MatchedVideo> matchedVideos;
 

core/src/main/java/com/tzld/videoVector/service/impl/VideoSearchServiceImpl.java

@@ -1542,7 +1542,7 @@ public class VideoSearchServiceImpl implements VideoSearchService {
                     + "|" + r.getDemandType() + "|" + r.getDemandContentId()
                     + "|" + r.getDemandContentTitle() + "|" + r.getDemandContentTopic()
                     + "|" + r.getPointType() + "|" + r.getStandardElement()
-                    + "|" + r.getCategoryName();
+                    + "|" + r.getCategoryName() + "|" + r.getChannelLevel3();
 
             ChannelDemandMatchVO vo = groupMap.computeIfAbsent(key, k -> {
                 ChannelDemandMatchVO v = new ChannelDemandMatchVO();
@@ -1572,6 +1572,7 @@ public class VideoSearchServiceImpl implements VideoSearchService {
                 v.setUvRatio(r.getUvRatio());
                 v.setTotalRov(r.getTotalRov());
                 v.setOnlineAction(r.getOnlineAction());
+                v.setChannelLevel3(r.getChannelLevel3());
                 v.setMatchedVideos(new ArrayList<>());
                 return v;
             });

core/src/main/resources/generator/mybatis-pgvector-generator-config.xml

@@ -80,12 +80,12 @@
 <!--        <table tableName="channel_demand_match_config" domainObjectName="ChannelDemandMatchConfig" alias="">-->
 <!--            <generatedKey column="id" sqlStatement="JDBC" identity="true"/>-->
 <!--        </table>-->
-<!--        <table tableName="channel_demand_match_result" domainObjectName="ChannelDemandMatchResult" alias="">-->
-<!--            <generatedKey column="id" sqlStatement="JDBC" identity="true"/>-->
-<!--        </table>-->
-        <table tableName="video_deconstruct_result" domainObjectName="VideoDeconstructResult" alias="">
+        <table tableName="channel_demand_match_result" domainObjectName="ChannelDemandMatchResult" alias="">
             <generatedKey column="id" sqlStatement="JDBC" identity="true"/>
         </table>
+<!--        <table tableName="video_deconstruct_result" domainObjectName="VideoDeconstructResult" alias="">-->
+<!--            <generatedKey column="id" sqlStatement="JDBC" identity="true"/>-->
+<!--        </table>-->
     </context>
 
 </generatorConfiguration>

core/src/main/resources/mapper/pgVector/ChannelDemandMatchResultMapper.xml

@@ -45,6 +45,7 @@
     <result column="demand_content_topic" jdbcType="VARCHAR" property="demandContentTopic" />
     <result column="uv_ratio" jdbcType="DOUBLE" property="uvRatio" />
     <result column="experiment_id" jdbcType="VARCHAR" property="experimentId" />
+    <result column="channel_level3" jdbcType="VARCHAR" property="channelLevel3" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -123,7 +124,7 @@
     online_action, match_experiment_id, demand_id, crowd_package, conversion_target, 
     partner, account, scene_value, demand_strategy, drive_dimension_time, demand_filter_sort_strategy, 
     demand_type, demand_content_id, demand_content_title, demand_content_topic, uv_ratio, 
-    experiment_id
+    experiment_id, channel_level3
   </sql>
   <select id="selectByExample" parameterType="com.tzld.videoVector.model.po.pgVector.ChannelDemandMatchResultExample" resultMap="BaseResultMap">
     <!--
@@ -188,8 +189,8 @@
       account, scene_value, demand_strategy, 
       drive_dimension_time, demand_filter_sort_strategy, 
       demand_type, demand_content_id, demand_content_title, 
-      demand_content_topic, uv_ratio, experiment_id
-      )
+      demand_content_topic, uv_ratio, experiment_id, 
+      channel_level3)
     values (#{configId,jdbcType=BIGINT}, #{dt,jdbcType=VARCHAR}, #{channelName,jdbcType=VARCHAR}, 
       #{crowdSegment,jdbcType=VARCHAR}, #{dimension,jdbcType=VARCHAR}, #{pointType,jdbcType=VARCHAR}, 
       #{standardElement,jdbcType=VARCHAR}, #{categoryName,jdbcType=VARCHAR}, #{crowdCount,jdbcType=INTEGER}, 
@@ -202,8 +203,8 @@
       #{account,jdbcType=VARCHAR}, #{sceneValue,jdbcType=VARCHAR}, #{demandStrategy,jdbcType=VARCHAR}, 
       #{driveDimensionTime,jdbcType=VARCHAR}, #{demandFilterSortStrategy,jdbcType=VARCHAR}, 
       #{demandType,jdbcType=VARCHAR}, #{demandContentId,jdbcType=VARCHAR}, #{demandContentTitle,jdbcType=VARCHAR}, 
-      #{demandContentTopic,jdbcType=VARCHAR}, #{uvRatio,jdbcType=DOUBLE}, #{experimentId,jdbcType=VARCHAR}
-      )
+      #{demandContentTopic,jdbcType=VARCHAR}, #{uvRatio,jdbcType=DOUBLE}, #{experimentId,jdbcType=VARCHAR}, 
+      #{channelLevel3,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.tzld.videoVector.model.po.pgVector.ChannelDemandMatchResult" useGeneratedKeys="true">
     <!--
@@ -326,6 +327,9 @@
       <if test="experimentId != null">
         experiment_id,
       </if>
+      <if test="channelLevel3 != null">
+        channel_level3,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="configId != null">
@@ -442,6 +446,9 @@
       <if test="experimentId != null">
         #{experimentId,jdbcType=VARCHAR},
       </if>
+      <if test="channelLevel3 != null">
+        #{channelLevel3,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.tzld.videoVector.model.po.pgVector.ChannelDemandMatchResultExample" resultType="java.lang.Long">
@@ -578,6 +585,9 @@
       <if test="record.experimentId != null">
         experiment_id = #{record.experimentId,jdbcType=VARCHAR},
       </if>
+      <if test="record.channelLevel3 != null">
+        channel_level3 = #{record.channelLevel3,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -627,7 +637,8 @@
       demand_content_title = #{record.demandContentTitle,jdbcType=VARCHAR},
       demand_content_topic = #{record.demandContentTopic,jdbcType=VARCHAR},
       uv_ratio = #{record.uvRatio,jdbcType=DOUBLE},
-      experiment_id = #{record.experimentId,jdbcType=VARCHAR}
+      experiment_id = #{record.experimentId,jdbcType=VARCHAR},
+      channel_level3 = #{record.channelLevel3,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -753,6 +764,9 @@
       <if test="experimentId != null">
         experiment_id = #{experimentId,jdbcType=VARCHAR},
       </if>
+      <if test="channelLevel3 != null">
+        channel_level3 = #{channelLevel3,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -799,7 +813,8 @@
       demand_content_title = #{demandContentTitle,jdbcType=VARCHAR},
       demand_content_topic = #{demandContentTopic,jdbcType=VARCHAR},
       uv_ratio = #{uvRatio,jdbcType=DOUBLE},
-      experiment_id = #{experimentId,jdbcType=VARCHAR}
+      experiment_id = #{experimentId,jdbcType=VARCHAR},
+      channel_level3 = #{channelLevel3,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>