|
|
@@ -62,11 +62,11 @@ public abstract class AbstractFilterService {
|
|
|
param.getAppType(), param.getRegionCode(), param.getAppRegionFiltered(), param.getVideosWithRisk(),
|
|
|
param.getVideoIds(), param.getForceTruncation());
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
+<<<<<<<HEAD
|
|
|
+ =======
|
|
|
// TODO 供给实验
|
|
|
|
|
|
->>>>>>> 8475e4d (supply exp)
|
|
|
+>>>>>>>8475e4d (supply exp)
|
|
|
videoIds = filterBySupplyExp(param.getAppType(), param.getExpIdMap(), videoIds);
|
|
|
|
|
|
if (param.isNotUsePreView()) {
|
|
|
@@ -101,18 +101,6 @@ public abstract class AbstractFilterService {
|
|
|
.filter(l -> !supplyExpVideos.contains(l))
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
- // 对照组，需要过滤掉视频
|
|
|
- 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;
|
|
|
-=======
|
|
|
->>>>>>> 8475e4d (supply exp)
|
|
|
}
|
|
|
|
|
|
private List<Long> filterByViewedConcurrent(int appType, String mid, String uid, List<Long> videoIds) {
|
丁云鹏