|
@@ -9,7 +9,6 @@ import com.tzld.piaoquan.recommend.server.repository.WxVideoTagRelRepository;
|
|
|
import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
|
|
|
import com.tzld.piaoquan.recommend.server.service.filter.FilterStrategy;
|
|
|
import com.tzld.piaoquan.recommend.server.util.CommonCollectionUtils;
|
|
|
-import com.tzld.piaoquan.recommend.server.util.JSONUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.collections4.MapUtils;
|
|
@@ -83,24 +82,19 @@ public class SecurityStrategy implements FilterStrategy {
|
|
|
|
|
|
boolean hit = securityGlobalSwitch
|
|
|
|| CommonCollectionUtils.contains(param.getAbExpCodes(), securityAbExpCode);
|
|
|
- log.info("SecurityStrategy hit={}", hit);
|
|
|
if (!hit) {
|
|
|
return param.getVideoIds();
|
|
|
}
|
|
|
|
|
|
- log.info("SecurityStrategy excludeScenes={}", JSONUtils.toJson(excludeScenes));
|
|
|
if (CollectionUtils.isEmpty(excludeScenes)
|
|
|
|| !CommonCollectionUtils.contains(excludeScenes, param.getHotSceneType())) {
|
|
|
|
|
|
- log.info("SecurityStrategy videoFilterCityTagIdMap={}", JSONUtils.toJson(videoFilterCityTagIdMap));
|
|
|
if (MapUtils.isEmpty(videoFilterCityTagIdMap)
|
|
|
|| !videoFilterCityTagIdMap.containsKey(param.getCityCode())) {
|
|
|
return param.getVideoIds();
|
|
|
}
|
|
|
|
|
|
-
|
|
|
Set<Long> filterVideos = videoCache.getUnchecked(param.getCityCode());
|
|
|
- log.info("SecurityStrategy filterVideos={}", JSONUtils.toJson(filterVideos));
|
|
|
if (CollectionUtils.isEmpty(filterVideos)) {
|
|
|
return param.getVideoIds();
|
|
|
}
|
|
@@ -109,8 +103,6 @@ public class SecurityStrategy implements FilterStrategy {
|
|
|
.filter(l -> !filterVideos.contains(l))
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
- log.info("SecurityStrategy before={} after={}", JSONUtils.toJson(param.getVideoIds()), JSONUtils.toJson(result));
|
|
|
-
|
|
|
return result;
|
|
|
}
|
|
|
return param.getVideoIds();
|