filter

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

@@ -31,13 +31,8 @@ public abstract class AbstractFilterService implements FilterService {
         // 风险过滤
         List<Long> videoIds = filterWithRiskVideo(param.getRiskFilterFlag(),
                 param.getAppType(), param.getRegionCode(), param.getAppRegionFiltered(), param.getVideosWithRisk(),
-<<<<<<< HEAD
-                param.getVideoIds());
-        // log.info("filterByRiskVideos videoIds={}", JSONUtils.toJson(videoIds));
-=======
                 param.getVideoIds(), param.getForceTruncation());
-        log.info("filterByRiskVideos videoIds={}", JSONUtils.toJson(videoIds));
->>>>>>> 5917e10 (compatible)
+        // log.info("filterByRiskVideos videoIds={}", JSONUtils.toJson(videoIds));
         videoIds = filterByPreViewed(param.getAppType(), param.getMid(), videoIds);
         // log.info("filterByPreViewed videoIds={}", JSONUtils.toJson(videoIds));
         videoIds = filterByViewed(param.getAppType(), param.getMid(), param.getUid(), videoIds);

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

@@ -135,17 +135,11 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
                 lastVideoId = t.getValue();
                 videoMap.put(NumberUtils.toLong(t.getValue(), 0), t.getScore());
             }
-<<<<<<< HEAD
-            filterService.forceTruncation = 20;
-            FilterResult filterResult = filterService.filter(FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet())));
-            // log.info("recall filterResult={}", JSONUtils.toJson(filterResult));
-=======
             FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
             filterParam.setForceTruncation(20);
-            
+
             FilterResult filterResult = filterService.filter(filterParam);
-            log.info("recall filterResult={}", JSONUtils.toJson(filterResult));
->>>>>>> 5917e10 (compatible)
+            // log.info("recall filterResult={}", JSONUtils.toJson(filterResult));
 
             if (filterResult != null && CollectionUtils.isNotEmpty(filterResult.getVideoIds())) {
                 filterResult.getVideoIds().stream().forEach(vid -> {