feat:添加pageNum字段

recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/Recommend.java

@@ -56,7 +56,7 @@ public final class Recommend {
       "\n2com/tzld/piaoquan/recommend/server/rec" +
       "ommend.proto\032\031google/protobuf/any.proto\032" +
       "/com/tzld/piaoquan/recommend/server/comm" +
-      "on.proto\"\364\004\n\020RecommendRequest\022\022\n\nrequest" +
+      "on.proto\"\205\005\n\020RecommendRequest\022\022\n\nrequest" +
       "_id\030\001 \001(\t\022\013\n\003mid\030\002 \001(\t\022\013\n\003uid\030\003 \001(\t\022\014\n\004s" +
       "ize\030\004 \001(\005\022\020\n\010app_type\030\005 \001(\005\022\021\n\tcity_code" +
       "\030\006 \001(\t\022\025\n\rprovince_code\030\007 \001(\t\022\023\n\013ab_exp_" +
@@ -70,26 +70,26 @@ public final class Recommend {
       "page_source\030\023 \001(\t\022\023\n\013category_id\030\024 \001(\t\022\026" +
       "\n\016hot_scene_type\030\025 \001(\003\022\021\n\tclient_ip\030\026 \001(" +
       "\t\022\024\n\014version_code\030\027 \001(\005\022\026\n\016root_source_i" +
-      "d\030\030 \001(\t\022\026\n\016userShareDepth\030\031 \001(\005\032.\n\014Event" +
-      "IdEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"" +
-      "\177\n\020MachineInfoProto\022\r\n\005brand\030\001 \001(\t\022\r\n\005mo" +
-      "del\030\002 \001(\t\022\020\n\010platform\030\003 \001(\t\022\023\n\013sdk_versi" +
-      "on\030\004 \001(\t\022\016\n\006system\030\005 \001(\t\022\026\n\016wechat_versi" +
-      "on\030\006 \001(\t\"H\n\021RecommendResponse\022\027\n\006result\030" +
-      "\001 \001(\0132\007.Result\022\032\n\005video\030\002 \003(\0132\013.VideoPro" +
-      "to\"\336\001\n\nVideoProto\022\020\n\010video_id\030\001 \001(\003\022\021\n\tr" +
-      "ov_score\030\002 \001(\001\022\021\n\tpush_from\030\003 \001(\t\022\017\n\007ab_" +
-      "code\030\004 \001(\t\022\022\n\nsort_score\030\005 \001(\001\022\020\n\010positi" +
-      "on\030\006 \001(\005\022\021\n\tflow_pool\030\007 \001(\t\022\027\n\017is_in_flo" +
-      "w_pool\030\010 \001(\005\022\014\n\004rand\030\t \001(\001\022\'\n\017push_from_" +
-      "index\030\n \003(\0132\016.PushFromIndex\"1\n\rPushFromI" +
-      "ndex\022\021\n\tpush_from\030\001 \001(\t\022\r\n\005index\030\002 \003(\t2\212" +
-      "\001\n\020RecommendService\022:\n\021HomepageRecommend" +
-      "\022\021.RecommendRequest\032\022.RecommendResponse\022" +
-      ":\n\021RelevantRecommend\022\021.RecommendRequest\032" +
-      "\022.RecommendResponseB7\n0com.tzld.piaoquan" +
-      ".recommend.server.gen.recommendP\001\210\001\001b\006pr" +
-      "oto3"
+      "d\030\030 \001(\t\022\026\n\016userShareDepth\030\031 \001(\005\022\017\n\007pageN" +
+      "um\030\032 \001(\005\032.\n\014EventIdEntry\022\013\n\003key\030\001 \001(\t\022\r\n" +
+      "\005value\030\002 \001(\t:\0028\001\"\177\n\020MachineInfoProto\022\r\n\005" +
+      "brand\030\001 \001(\t\022\r\n\005model\030\002 \001(\t\022\020\n\010platform\030\003" +
+      " \001(\t\022\023\n\013sdk_version\030\004 \001(\t\022\016\n\006system\030\005 \001(" +
+      "\t\022\026\n\016wechat_version\030\006 \001(\t\"H\n\021RecommendRe" +
+      "sponse\022\027\n\006result\030\001 \001(\0132\007.Result\022\032\n\005video" +
+      "\030\002 \003(\0132\013.VideoProto\"\336\001\n\nVideoProto\022\020\n\010vi" +
+      "deo_id\030\001 \001(\003\022\021\n\trov_score\030\002 \001(\001\022\021\n\tpush_" +
+      "from\030\003 \001(\t\022\017\n\007ab_code\030\004 \001(\t\022\022\n\nsort_scor" +
+      "e\030\005 \001(\001\022\020\n\010position\030\006 \001(\005\022\021\n\tflow_pool\030\007" +
+      " \001(\t\022\027\n\017is_in_flow_pool\030\010 \001(\005\022\014\n\004rand\030\t " +
+      "\001(\001\022\'\n\017push_from_index\030\n \003(\0132\016.PushFromI" +
+      "ndex\"1\n\rPushFromIndex\022\021\n\tpush_from\030\001 \001(\t" +
+      "\022\r\n\005index\030\002 \003(\t2\212\001\n\020RecommendService\022:\n\021" +
+      "HomepageRecommend\022\021.RecommendRequest\032\022.R" +
+      "ecommendResponse\022:\n\021RelevantRecommend\022\021." +
+      "RecommendRequest\032\022.RecommendResponseB7\n0" +
+      "com.tzld.piaoquan.recommend.server.gen.r" +
+      "ecommendP\001\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -102,7 +102,7 @@ public final class Recommend {
     internal_static_RecommendRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_RecommendRequest_descriptor,
-        new java.lang.String[] { "RequestId", "Mid", "Uid", "Size", "AppType", "CityCode", "ProvinceCode", "AbExpCode", "EventId", "VersionAuditStatus", "RecommendTraceId", "VideoId", "City", "Province", "MachineInfo", "NewExpGroup", "SessionId", "SubSessionId", "PageSource", "CategoryId", "HotSceneType", "ClientIp", "VersionCode", "RootSourceId", "UserShareDepth", });
+        new java.lang.String[] { "RequestId", "Mid", "Uid", "Size", "AppType", "CityCode", "ProvinceCode", "AbExpCode", "EventId", "VersionAuditStatus", "RecommendTraceId", "VideoId", "City", "Province", "MachineInfo", "NewExpGroup", "SessionId", "SubSessionId", "PageSource", "CategoryId", "HotSceneType", "ClientIp", "VersionCode", "RootSourceId", "UserShareDepth", "PageNum", });
     internal_static_RecommendRequest_EventIdEntry_descriptor =
       internal_static_RecommendRequest_descriptor.getNestedTypes().get(0);
     internal_static_RecommendRequest_EventIdEntry_fieldAccessorTable = new

recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequest.java

@@ -225,6 +225,11 @@ private static final long serialVersionUID = 0L;
             userShareDepth_ = input.readInt32();
             break;
           }
+          case 208: {
+
+            pageNum_ = input.readInt32();
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -1077,6 +1082,17 @@ private static final long serialVersionUID = 0L;
     return userShareDepth_;
   }
 
+  public static final int PAGENUM_FIELD_NUMBER = 26;
+  private int pageNum_;
+  /**
+   * <code>int32 pageNum = 26;</code>
+   * @return The pageNum.
+   */
+  @java.lang.Override
+  public int getPageNum() {
+    return pageNum_;
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -1169,6 +1185,9 @@ private static final long serialVersionUID = 0L;
     if (userShareDepth_ != 0) {
       output.writeInt32(25, userShareDepth_);
     }
+    if (pageNum_ != 0) {
+      output.writeInt32(26, pageNum_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -1273,6 +1292,10 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(25, userShareDepth_);
     }
+    if (pageNum_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(26, pageNum_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1341,6 +1364,8 @@ private static final long serialVersionUID = 0L;
         .equals(other.getRootSourceId())) return false;
     if (getUserShareDepth()
         != other.getUserShareDepth()) return false;
+    if (getPageNum()
+        != other.getPageNum()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -1410,6 +1435,8 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getRootSourceId().hashCode();
     hash = (37 * hash) + USERSHAREDEPTH_FIELD_NUMBER;
     hash = (53 * hash) + getUserShareDepth();
+    hash = (37 * hash) + PAGENUM_FIELD_NUMBER;
+    hash = (53 * hash) + getPageNum();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1618,6 +1645,8 @@ private static final long serialVersionUID = 0L;
 
       userShareDepth_ = 0;
 
+      pageNum_ = 0;
+
       return this;
     }
 
@@ -1679,6 +1708,7 @@ private static final long serialVersionUID = 0L;
       result.versionCode_ = versionCode_;
       result.rootSourceId_ = rootSourceId_;
       result.userShareDepth_ = userShareDepth_;
+      result.pageNum_ = pageNum_;
       onBuilt();
       return result;
     }
@@ -1823,6 +1853,9 @@ private static final long serialVersionUID = 0L;
       if (other.getUserShareDepth() != 0) {
         setUserShareDepth(other.getUserShareDepth());
       }
+      if (other.getPageNum() != 0) {
+        setPageNum(other.getPageNum());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -3614,6 +3647,37 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private int pageNum_ ;
+    /**
+     * <code>int32 pageNum = 26;</code>
+     * @return The pageNum.
+     */
+    @java.lang.Override
+    public int getPageNum() {
+      return pageNum_;
+    }
+    /**
+     * <code>int32 pageNum = 26;</code>
+     * @param value The pageNum to set.
+     * @return This builder for chaining.
+     */
+    public Builder setPageNum(int value) {
+      
+      pageNum_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 pageNum = 26;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearPageNum() {
+      
+      pageNum_ = 0;
+      onChanged();
+      return this;
+    }
     @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {

recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequestOrBuilder.java

@@ -318,4 +318,10 @@ public interface RecommendRequestOrBuilder extends
    * @return The userShareDepth.
    */
   int getUserShareDepth();
+
+  /**
+   * <code>int32 pageNum = 26;</code>
+   * @return The pageNum.
+   */
+  int getPageNum();
 }

recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/recommend.proto

@@ -34,6 +34,7 @@ message RecommendRequest {
   int32 version_code = 23;
   string root_source_id = 24;
   int32 userShareDepth = 25; // default -1
+  int32 pageNum = 26;
 }
 
 message MachineInfoProto {

recommend-server-service/pom.xml

@@ -175,7 +175,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-server-client</artifactId>
-            <version>1.1.7</version>
+            <version>1.1.8</version>
         </dependency>
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
@@ -252,7 +252,7 @@
         <dependency>
             <groupId>ml.dmlc</groupId>
             <artifactId>xgboost4j-spark_2.12</artifactId>
-            <version>1.7.6</version>
+            <version>2.0.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>scala-library</artifactId>

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RecommendParam.java

@@ -45,5 +45,7 @@ public class RecommendParam {
 
     private String rootSourceId;
     private Integer userShareDepth;
+
+    private int pageNum;
 }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/RecommendService.java

@@ -12,7 +12,6 @@ import com.tzld.piaoquan.recommend.server.gen.recommend.*;
 import com.tzld.piaoquan.recommend.server.model.MachineInfo;
 import com.tzld.piaoquan.recommend.server.model.RecommendParam;
 import com.tzld.piaoquan.recommend.server.model.Video;
-import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolConfigService;
 import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolConstants;
 import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolService;
 import com.tzld.piaoquan.recommend.server.service.rank.RankParam;
@@ -28,7 +27,6 @@ import com.tzld.piaoquan.recommend.server.util.TraceUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -354,6 +352,7 @@ public class RecommendService {
         param.setVersionCode(request.getVersionCode());
         param.setRootSourceId(request.getRootSourceId());
         param.setUserShareDepth(request.getUserShareDepth());
+        param.setPageNum(request.getPageNum());
         return param;
     }
 
@@ -363,14 +362,14 @@ public class RecommendService {
 
         long recallTime = stopwatch.elapsed(TimeUnit.MILLISECONDS);
         timerLogMapTL.get().put("recallTime", recallTime);
-        //log.info("recallResult={}, videoRecommend recallResult cost={}", recallResult, recallTime);
+        // log.info("recallResult={}, videoRecommend recallResult cost={}", recallResult, recallTime);
         stopwatch.reset().start();
 
         RankResult rankResult = rankRouter.rank(convertToRankParam(param, recallResult));
 
         long rankTime = stopwatch.elapsed(TimeUnit.MILLISECONDS);
         timerLogMapTL.get().put("rankTime", rankTime);
-        //log.info("rankResult={}, videoRecommend rank cost={}", rankResult, rankTime);
+        // log.info("rankResult={}, videoRecommend rank cost={}", rankResult, rankTime);
 
 
         if (rankResult == null || CollectionUtils.isEmpty(rankResult.getVideos())) {
@@ -405,7 +404,7 @@ public class RecommendService {
         recallParam.setMid(param.getMid());
         recallParam.setSize(param.getSize());
         recallParam.setUid(param.getUid());
-        //风险过滤
+        // 风险过滤
         recallParam.setRiskUser(param.isRiskUser());
         recallParam.setAbExpCodes(param.getAbExpCodes());