|
@@ -53,9 +53,9 @@ public abstract class AbstractFilterService {
|
|
obj.put("concurrent", param.concurrent);
|
|
obj.put("concurrent", param.concurrent);
|
|
obj.put("notUsePreView", param.notUsePreView);
|
|
obj.put("notUsePreView", param.notUsePreView);
|
|
obj.put("size1", videoIds.size());
|
|
obj.put("size1", videoIds.size());
|
|
- if (param.isNotUsePreView()){
|
|
|
|
- ;
|
|
|
|
- }else {
|
|
|
|
|
|
+ if (param.isNotUsePreView()) {
|
|
|
|
+ ;
|
|
|
|
+ } else {
|
|
videoIds = filterByPreViewed(param.getAppType(), param.getMid(), videoIds);
|
|
videoIds = filterByPreViewed(param.getAppType(), param.getMid(), videoIds);
|
|
}
|
|
}
|
|
obj.put("size2", videoIds.size());
|
|
obj.put("size2", videoIds.size());
|
|
@@ -241,11 +241,8 @@ public abstract class AbstractFilterService {
|
|
if (CollectionUtils.isEmpty(videoIds)) {
|
|
if (CollectionUtils.isEmpty(videoIds)) {
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
}
|
|
}
|
|
- List<Long> result = videoIds.get(0);
|
|
|
|
- if (CollectionUtils.isEmpty(result)) {
|
|
|
|
- return Collections.emptyList();
|
|
|
|
- }
|
|
|
|
- for (int i = 1; i < videoIds.size(); ++i) {
|
|
|
|
|
|
+ List<Long> result = new ArrayList<>();
|
|
|
|
+ for (int i = 0; i < videoIds.size(); ++i) {
|
|
result.retainAll(videoIds.get(i));
|
|
result.retainAll(videoIds.get(i));
|
|
}
|
|
}
|
|
log.info("filter result {}", JSONUtils.toJson(result));
|
|
log.info("filter result {}", JSONUtils.toJson(result));
|