homepage recommend

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

@@ -12,8 +12,7 @@ import org.springframework.context.annotation.ComponentScan;
 @ComponentScan({
         "com.tzld.piaoquan.recommend.server.service",
         "com.tzld.piaoquan.recommend.server.grpcservice",
-        "com.tzld.piaoquan.recommend.server.config",
-        "com.tzld.piaoquan.recommend.server"
+        "com.tzld.piaoquan.recommend.server.config"
 })
 @EnableEurekaClient
 public class Application {

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

@@ -196,7 +196,6 @@ public class RecommendService {
         Map<String, String> abExpCode = abExpCodeMap.get(abInitialConfig);
         param.setAbCode(abExpCode.get("ab_code"));
         param.setRuleKey(abExpCode.get("rule_key"));
-        param.setDataKey(abExpCode.get("data_key"));
         param.setRankKeyPrefix("rank:score1:");
 
         // 实验配置
@@ -235,7 +234,9 @@ public class RecommendService {
             if (recommendType == 0) {
                 String eventId = request.getEventIdMap().get("10003");
                 Map<String, Map<String, String>> appAbCode = appAbCodeMap.get("10003");
-                if (StringUtils.isNotBlank(eventId) && appAbCode.containsKey(eventId)) {
+                if (StringUtils.isNotBlank(eventId)
+                        && appAbCode != null
+                        && appAbCode.containsKey(eventId)) {
                     param.setAbCode(appAbCode.get(eventId).get("ab_code"));
                     param.setRuleKey(appAbCode.get(eventId).get("rule_key"));
                     param.setDataKey(appAbCode.get(eventId).get("data_key"));
@@ -277,8 +278,9 @@ public class RecommendService {
         // mark video in flow pool
         // TODO 业务上有什么用处
         // 需要被标记的视频满足什么条件
-        markFlowPoolVideo(param, videos);
-        log.info("markFlowPoolVideo videos {}", videos);
+        // 该逻已经废弃
+        // markFlowPoolVideo(param, videos);
+        //log.info("markFlowPoolVideo videos {}", videos);
 
         return videos;
     }
@@ -291,7 +293,6 @@ public class RecommendService {
         recallParam.setFlowPoolAbtestGroup(param.getFlowPoolAbtestGroup());
         recallParam.setProvinceCode(param.getProvinceCode());
         recallParam.setCityCode(param.getCityCode());
-        recallParam.setDataKey(param.getDataKey());
         recallParam.setRuleKey(param.getRuleKey());
         recallParam.setMid(param.getMid());
         recallParam.setSize(param.getSize());
@@ -312,7 +313,9 @@ public class RecommendService {
         return rankParam;
     }
 
+    @Deprecated
     private void markFlowPoolVideo(RecommendParam param, List<Video> videos) {
+        // TODO
         for (Video data : videos) {
             try {
                 Long videoId = data.getVideoId();

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

@@ -173,6 +173,7 @@ public class FlowPoolService {
     }
 
     private Map<Long, String> updateDistributeCount(List<Video> videos) {
+        // TODO 异步更新
         Map<Long, String> removeMap = new HashMap<>();
         videos.stream().forEach(v -> {
             String key = String.format(localDistributeCountFormat, v.getVideoId(), v.getFlowPool());