Merge branch 'feature_log' of algorithm/recommend-server into master

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

@@ -60,15 +60,8 @@ public abstract class AbstractFilterService {
                 param.getAppType(), param.getRegionCode(), param.getAppRegionFiltered(), param.getVideosWithRisk(),
                 param.getVideoIds(), param.getForceTruncation());
 
-        // TODO 供给实验
-        Map<String, String> obj = new HashMap<>();
-        obj.put("before", JSONUtils.toJson(videoIds));
-
         videoIds = filterBySupplyExp(param.getAppType(), param.getExpIdMap(), videoIds);
 
-        obj.put("after", JSONUtils.toJson(videoIds));
-        log.info("supply filter {}", JSONUtils.toJson(obj));
-
         if (param.isNotUsePreView()) {
 
         } else {
@@ -95,10 +88,14 @@ public abstract class AbstractFilterService {
             return videoIds;
         }
         // 对照组，需要过滤掉视频
-        return videoIds.stream()
+        Map<String, String> obj = new HashMap<>();
+        obj.put("before", JSONUtils.toJson(videoIds));
+        List<Long> result = videoIds.stream()
                 .filter(l -> !supplyExpVideos.contains(l))
                 .collect(Collectors.toList());
-
+        obj.put("after", JSONUtils.toJson(result));
+        log.info("supply filter {}", JSONUtils.toJson(obj));
+        return result;
     }
 
     private List<Long> filterByViewedConcurrent(int appType, String mid, String uid, List<Long> videoIds) {