获取opengid

recommend-server-client/pom.xml

@@ -54,9 +54,9 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.6.1</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.12.0:exe:osx-x86_64</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.34.1:exe:osx-x86_64</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.34.1:exe:${os.detected.classifier}</pluginArtifact>
                     <!--设置grpc生成代码到指定路径-->
                     <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
                     <!--生成代码前是否清空目录-->

recommend-server-service/pom.xml

@@ -175,7 +175,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-server-client</artifactId>
-            <version>1.1.11</version>
+            <version>1.1.12</version>
         </dependency>
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>

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

@@ -60,5 +60,6 @@ public class RecommendParam {
     private String currentPageSource;
 
     private Map<String, String> creativeInfoFeature;
+    private String openGId;
 }
 

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

@@ -46,7 +46,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 import java.time.Duration;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -428,6 +427,7 @@ public class RecommendService {
         param.setRecommendType(recommendType);
         param.setRequestVideoId(request.getRequestVideoId());
         param.setCurrentPageSource(request.getCurrentPageSource());
+        param.setOpenGId(request.getOpenGId());
 
         Map<String, String> creativeInfoFeature = this.getCreativeInfoFeature(request.getRootSourceId(), channelName, request.getUserShareDepth());
         param.setCreativeInfoFeature(creativeInfoFeature);
@@ -580,6 +580,7 @@ public class RecommendService {
         recallParam.setRequestVideoId(param.getRequestVideoId());
         recallParam.setCurrentPageSource(param.getCurrentPageSource());
         recallParam.setCreativeInfoFeature(param.getCreativeInfoFeature());
+        recallParam.setOpenGId(param.getOpenGId());
         return recallParam;
     }
 
@@ -612,6 +613,7 @@ public class RecommendService {
         rankParam.setRequestVideoId(param.getRequestVideoId());
         rankParam.setCurrentPageSource(param.getCurrentPageSource());
         rankParam.setCreativeInfoFeature(param.getCreativeInfoFeature());
+        rankParam.setOpenGId(param.getOpenGId());
         return rankParam;
     }
 

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

@@ -28,8 +28,8 @@ public class RankParam {
     private String city;
     private MachineInfo machineInfo;
     private Set<String> abExpCodes;
-    private Long headVid=0L;
-    private Long hotSceneType=0L;
+    private Long headVid = 0L;
+    private Long hotSceneType = 0L;
 
     private Integer categoryId;
     private Integer versionCode;
@@ -48,4 +48,5 @@ public class RankParam {
     private String currentPageSource;
     private Map<String, String> creativeInfoFeature;
     private Map<String, Map<String, String>> behaviorVideos;
+    private String openGId;
 }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelBasic.java

@@ -394,19 +394,23 @@ public abstract class RankStrategy4RegionMergeModelBasic extends RankService {
         return map;
     }
 
-    protected Map<String, String> getUserRegion(RankParam param) {
-        Map<String, String> regionMap = new HashMap<>();
+    protected Map<String, String> getContextInfo(RankParam param) {
+        Map<String, String> contextInfo = new HashMap<>();
         if (null != param) {
             String province = param.getProvince();
             if (null != province && !province.isEmpty()) {
-                regionMap.put("province", province.replaceAll("省$", ""));
+                contextInfo.put("province", province.replaceAll("省$", ""));
             }
             String city = param.getCity();
             if (null != city && !city.isEmpty()) {
-                regionMap.put("city", city.replaceAll("市$", ""));
+                contextInfo.put("city", city.replaceAll("市$", ""));
+            }
+            String openGId = param.getOpenGId();
+            if (null != openGId && !openGId.isEmpty()) {
+                contextInfo.put("openGId", openGId);
             }
         }
-        return regionMap;
+        return contextInfo;
     }
 
     /**

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV564.java

@@ -125,7 +125,7 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
 
         List<Video> result = new ArrayList<>();
         for (RankItem item : items) {
@@ -177,8 +177,8 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV565.java

@@ -128,7 +128,7 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
 
         List<Video> result = new ArrayList<>();
         for (RankItem item : items) {
@@ -185,8 +185,8 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV566.java

@@ -135,7 +135,7 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
         Map<String, Double> prioriVidProvinceRovn = this.getPrioriVidProvinceRovn(param.getProvince(), items, videoBaseInfoMap);
 
         List<Video> result = new ArrayList<>();
@@ -193,8 +193,8 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV567.java

@@ -128,7 +128,7 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
 
         List<Video> result = new ArrayList<>();
         for (RankItem item : items) {
@@ -180,8 +180,8 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV568.java

@@ -135,7 +135,7 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
         Map<String, Double> prioriVidProvinceRovn = this.getPrioriVidProvinceRovn(param.getProvince(), items, videoBaseInfoMap);
 
         List<Video> result = new ArrayList<>();
@@ -193,8 +193,8 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

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

@@ -48,4 +48,5 @@ public class RecallParam {
     private String currentPageSource;
     private Map<String, String> creativeInfoFeature;
     private Map<String, Map<String, String>> behaviorVideos;
+    private String openGId;
 }