召回改造

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

@@ -48,25 +48,25 @@ public abstract class AbstractFilterService {
                 param.getAppType(), param.getRegionCode(), param.getAppRegionFiltered(), param.getVideosWithRisk(),
                 param.getVideoIds(), param.getForceTruncation());
         // log.info("filterByRiskVideos videoIds={}", JSONUtils.toJson(videoIds));
-//        JSONObject obj = new JSONObject();
-//        obj.put("zhangbotest", "");
-//        obj.put("concurrent", param.concurrent);
-//        obj.put("notUsePreView", param.notUsePreView);
-//        obj.put("size1", videoIds.size());
+        JSONObject obj = new JSONObject();
+        obj.put("zhangbotest", "");
+        obj.put("concurrent", param.concurrent);
+        obj.put("notUsePreView", param.notUsePreView);
+        obj.put("size1", videoIds.size());
         if (param.isNotUsePreView()){
            ;
         }else {
             videoIds = filterByPreViewed(param.getAppType(), param.getMid(), videoIds);
         }
-//        obj.put("size2", videoIds.size());
+        obj.put("size2", videoIds.size());
         // log.info("filterByPreViewed videoIds={}", JSONUtils.toJson(videoIds));
         if (param.isConcurrent()) {
             videoIds = filterByViewedConcurrent(param.getAppType(), param.getMid(), param.getUid(), videoIds);
         } else {
             videoIds = filterByViewed(param.getAppType(), param.getMid(), param.getUid(), videoIds);
         }
-//        obj.put("size3", videoIds.size());
-//        log.info(obj.toString());
+        obj.put("size3", videoIds.size());
+        log.info(obj.toString());
         // log.info("filterByViewed videoIds={}", JSONUtils.toJson(videoIds));
         return videoIds;
     }
@@ -102,7 +102,7 @@ public abstract class AbstractFilterService {
             futures.add(future);
         }
         try {
-            cdl.await(400, TimeUnit.MILLISECONDS);
+            cdl.await(600, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             log.error("filter error", e);
             return null;

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

@@ -69,7 +69,7 @@ public class RegionRealtimeRecallStrategyV1 implements RecallStrategy {
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
         filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
-        filterParam.setNotUsePreView(true);
+        filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);
         long t2 = new Long(System.currentTimeMillis());
         JSONObject obj = new JSONObject();

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

@@ -45,7 +45,7 @@ public class RegionRealtimeRecallStrategyV2 implements RecallStrategy {
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
         filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
-        filterParam.setNotUsePreView(true);
+        filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);
         List<Video> videosResult = new ArrayList<>();
         if (filterResult != null && CollectionUtils.isNotEmpty(filterResult.getVideoIds())) {

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

@@ -53,7 +53,7 @@ public class RegionRealtimeRecallStrategyV3 implements RecallStrategy {
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
         filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
-        filterParam.setNotUsePreView(true);
+        filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);
         long t2 = new Long(System.currentTimeMillis());
         JSONObject obj = new JSONObject();

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

@@ -44,7 +44,7 @@ public class RegionRealtimeRecallStrategyV4 implements RecallStrategy {
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
         filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
-        filterParam.setNotUsePreView(true);
+        filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);
         List<Video> videosResult = new ArrayList<>();
         if (filterResult != null && CollectionUtils.isNotEmpty(filterResult.getVideoIds())) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score4recall/strategy/RegionRecallScorerV1.java

@@ -30,7 +30,7 @@ public class RegionRecallScorerV1 extends AbstractScorer4Recall {
             lists = model.kv.getOrDefault("中国", new ArrayList<>());
         }
 
-        return lists.subList(0, Math.min(80, lists.size()));
+        return lists.subList(0, Math.min(100, lists.size()));
     }
 
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score4recall/strategy/RegionRecallScorerV2.java

@@ -24,7 +24,7 @@ public class RegionRecallScorerV2 extends AbstractScorer4Recall {
         // todo zhangbo 这里要写实现功能
         Model4RecallList model = (Model4RecallList) this.getModel();
         List<Pair<Long, Double>> lists = model.recallList;
-        return lists.subList(0, Math.min(40, lists.size()));
+        return lists.subList(0, Math.min(100, lists.size()));
     }
 
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score4recall/strategy/RegionRecallScorerV3.java

@@ -30,7 +30,7 @@ public class RegionRecallScorerV3 extends AbstractScorer4Recall {
             lists = model.kv.getOrDefault("中国", new ArrayList<>());
         }
 
-        return lists.subList(0, Math.min(60, lists.size()));
+        return lists.subList(0, Math.min(100, lists.size()));
     }
 
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score4recall/strategy/RegionRecallScorerV4.java

@@ -24,7 +24,7 @@ public class RegionRecallScorerV4 extends AbstractScorer4Recall {
         // todo zhangbo 这里要写实现功能
         Model4RecallList model = (Model4RecallList) this.getModel();
         List<Pair<Long, Double>> lists = model.recallList;
-        return lists.subList(0, Math.min(40, lists.size()));
+        return lists.subList(0, Math.min(100, lists.size()));
     }