增加元素维度

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

@@ -316,6 +316,7 @@ public class ChannelDemandMatchJob {
         result.setStandardElement(record.getString("需求特征点"));
         result.setCategoryName(record.getString("需求特征类"));
         result.setChannelLevel3(record.getString("三级渠道"));
+        result.setElementDimension(record.getString("元素维度"));
 
         // 统计指标
         Double crowdCount = safeGetDouble(record, "人群总数量");
@@ -463,6 +464,7 @@ public class ChannelDemandMatchJob {
         fullKey.append("|").append(nullToEmpty(demand.getStandardElement()));
         fullKey.append("|").append(nullToEmpty(demand.getCategoryName()));
         fullKey.append("|").append(nullToEmpty(demand.getChannelLevel3()));
+        fullKey.append("|").append(nullToEmpty(demand.getElementDimension()));
         fullKey.append("|").append(matchVideoId);
         fullKey.append("|").append(nullToEmpty(matchConfigCode));
         String hash = Md5Util.encoderByMd5(fullKey.toString());
@@ -502,6 +504,7 @@ public class ChannelDemandMatchJob {
         row.setStandardElement(demand.getStandardElement());
         row.setCategoryName(demand.getCategoryName());
         row.setChannelLevel3(demand.getChannelLevel3());
+        row.setElementDimension(demand.getElementDimension());
         row.setCrowdCount(demand.getCrowdCount());
         row.setVisitUv(demand.getVisitUv());
         row.setUvRatio(demand.getUvRatio());
@@ -680,6 +683,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

@@ -448,6 +448,17 @@ public class ChannelDemandMatchResult {
      */
     private String channelLevel3;
 
+    /**
+     * Database Column Remarks:
+     *   元素维度
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_demand_match_result.element_dimension
+     *
+     * @mbg.generated
+     */
+    private String elementDimension;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column channel_demand_match_result.id
@@ -1408,6 +1419,30 @@ public class ChannelDemandMatchResult {
         this.channelLevel3 = channelLevel3;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_demand_match_result.element_dimension
+     *
+     * @return the value of channel_demand_match_result.element_dimension
+     *
+     * @mbg.generated
+     */
+    public String getElementDimension() {
+        return elementDimension;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_demand_match_result.element_dimension
+     *
+     * @param elementDimension the value for channel_demand_match_result.element_dimension
+     *
+     * @mbg.generated
+     */
+    public void setElementDimension(String elementDimension) {
+        this.elementDimension = elementDimension;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table channel_demand_match_result
@@ -1460,6 +1495,7 @@ public class ChannelDemandMatchResult {
         sb.append(", uvRatio=").append(uvRatio);
         sb.append(", experimentId=").append(experimentId);
         sb.append(", channelLevel3=").append(channelLevel3);
+        sb.append(", elementDimension=").append(elementDimension);
         sb.append("]");
         return sb.toString();
     }

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

@@ -2854,6 +2854,76 @@ public class ChannelDemandMatchResultExample {
             addCriterion("channel_level3 not between", value1, value2, "channelLevel3");
             return (Criteria) this;
         }
+
+        public Criteria andElementDimensionIsNull() {
+            addCriterion("element_dimension is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionIsNotNull() {
+            addCriterion("element_dimension is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionEqualTo(String value) {
+            addCriterion("element_dimension =", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionNotEqualTo(String value) {
+            addCriterion("element_dimension <>", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionGreaterThan(String value) {
+            addCriterion("element_dimension >", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionGreaterThanOrEqualTo(String value) {
+            addCriterion("element_dimension >=", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionLessThan(String value) {
+            addCriterion("element_dimension <", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionLessThanOrEqualTo(String value) {
+            addCriterion("element_dimension <=", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionLike(String value) {
+            addCriterion("element_dimension like", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionNotLike(String value) {
+            addCriterion("element_dimension not like", value, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionIn(List<String> values) {
+            addCriterion("element_dimension in", values, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionNotIn(List<String> values) {
+            addCriterion("element_dimension not in", values, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionBetween(String value1, String value2) {
+            addCriterion("element_dimension between", value1, value2, "elementDimension");
+            return (Criteria) this;
+        }
+
+        public Criteria andElementDimensionNotBetween(String value1, String value2) {
+            addCriterion("element_dimension not between", value1, value2, "elementDimension");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -91,6 +91,9 @@ public class ChannelDemandMatchVO {
     /** 三级渠道 */
     private String channelLevel3;
 
+    /** 元素维度 */
+    private String elementDimension;
+
     /** 匹配到的视频列表 */
     private List<MatchedVideo> matchedVideos;
 

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

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

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

@@ -46,6 +46,7 @@
     <result column="uv_ratio" jdbcType="DOUBLE" property="uvRatio" />
     <result column="experiment_id" jdbcType="VARCHAR" property="experimentId" />
     <result column="channel_level3" jdbcType="VARCHAR" property="channelLevel3" />
+    <result column="element_dimension" jdbcType="VARCHAR" property="elementDimension" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -124,7 +125,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, channel_level3
+    experiment_id, channel_level3, element_dimension
   </sql>
   <select id="selectByExample" parameterType="com.tzld.videoVector.model.po.pgVector.ChannelDemandMatchResultExample" resultMap="BaseResultMap">
     <!--
@@ -190,7 +191,7 @@
       drive_dimension_time, demand_filter_sort_strategy, 
       demand_type, demand_content_id, demand_content_title, 
       demand_content_topic, uv_ratio, experiment_id, 
-      channel_level3)
+      channel_level3, element_dimension)
     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}, 
@@ -204,7 +205,7 @@
       #{driveDimensionTime,jdbcType=VARCHAR}, #{demandFilterSortStrategy,jdbcType=VARCHAR}, 
       #{demandType,jdbcType=VARCHAR}, #{demandContentId,jdbcType=VARCHAR}, #{demandContentTitle,jdbcType=VARCHAR}, 
       #{demandContentTopic,jdbcType=VARCHAR}, #{uvRatio,jdbcType=DOUBLE}, #{experimentId,jdbcType=VARCHAR}, 
-      #{channelLevel3,jdbcType=VARCHAR})
+      #{channelLevel3,jdbcType=VARCHAR}, #{elementDimension,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.tzld.videoVector.model.po.pgVector.ChannelDemandMatchResult" useGeneratedKeys="true">
     <!--
@@ -330,6 +331,9 @@
       <if test="channelLevel3 != null">
         channel_level3,
       </if>
+      <if test="elementDimension != null">
+        element_dimension,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="configId != null">
@@ -449,6 +453,9 @@
       <if test="channelLevel3 != null">
         #{channelLevel3,jdbcType=VARCHAR},
       </if>
+      <if test="elementDimension != null">
+        #{elementDimension,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.tzld.videoVector.model.po.pgVector.ChannelDemandMatchResultExample" resultType="java.lang.Long">
@@ -588,6 +595,9 @@
       <if test="record.channelLevel3 != null">
         channel_level3 = #{record.channelLevel3,jdbcType=VARCHAR},
       </if>
+      <if test="record.elementDimension != null">
+        element_dimension = #{record.elementDimension,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -638,7 +648,8 @@
       demand_content_topic = #{record.demandContentTopic,jdbcType=VARCHAR},
       uv_ratio = #{record.uvRatio,jdbcType=DOUBLE},
       experiment_id = #{record.experimentId,jdbcType=VARCHAR},
-      channel_level3 = #{record.channelLevel3,jdbcType=VARCHAR}
+      channel_level3 = #{record.channelLevel3,jdbcType=VARCHAR},
+      element_dimension = #{record.elementDimension,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -767,6 +778,9 @@
       <if test="channelLevel3 != null">
         channel_level3 = #{channelLevel3,jdbcType=VARCHAR},
       </if>
+      <if test="elementDimension != null">
+        element_dimension = #{elementDimension,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -814,7 +828,8 @@
       demand_content_topic = #{demandContentTopic,jdbcType=VARCHAR},
       uv_ratio = #{uvRatio,jdbcType=DOUBLE},
       experiment_id = #{experimentId,jdbcType=VARCHAR},
-      channel_level3 = #{channelLevel3,jdbcType=VARCHAR}
+      channel_level3 = #{channelLevel3,jdbcType=VARCHAR},
+      element_dimension = #{elementDimension,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

core/src/main/resources/mapper/pgVector/ext/ChannelDemandMatchResultMapperExt.xml

@@ -13,7 +13,7 @@
       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, channel_level3)
+      demand_content_topic, uv_ratio, experiment_id, channel_level3, element_dimension)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.configId,jdbcType=BIGINT}, #{item.dt,jdbcType=VARCHAR}, #{item.channelName,jdbcType=VARCHAR},
@@ -27,7 +27,8 @@
       #{item.partner,jdbcType=VARCHAR}, #{item.account,jdbcType=VARCHAR}, #{item.sceneValue,jdbcType=VARCHAR},
       #{item.demandStrategy,jdbcType=VARCHAR}, #{item.driveDimensionTime,jdbcType=VARCHAR}, #{item.demandFilterSortStrategy,jdbcType=VARCHAR},
       #{item.demandType,jdbcType=VARCHAR}, #{item.demandContentId,jdbcType=VARCHAR}, #{item.demandContentTitle,jdbcType=VARCHAR},
-      #{item.demandContentTopic,jdbcType=VARCHAR}, #{item.uvRatio,jdbcType=DOUBLE}, #{item.experimentId,jdbcType=VARCHAR}, #{item.channelLevel3,jdbcType=VARCHAR})
+      #{item.demandContentTopic,jdbcType=VARCHAR}, #{item.uvRatio,jdbcType=DOUBLE}, #{item.experimentId,jdbcType=VARCHAR}, #{item.channelLevel3,jdbcType=VARCHAR},
+      #{item.elementDimension,jdbcType=VARCHAR})
     </foreach>
   </insert>
 </mapper>