|
@@ -2,6 +2,7 @@ package com.tzld.piaoquan.recommend.server.service.rank.strategy;
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
|
|
import com.google.common.reflect.TypeToken;
|
|
import com.google.common.reflect.TypeToken;
|
|
import com.tzld.piaoquan.recommend.feature.domain.video.base.UserFeature;
|
|
import com.tzld.piaoquan.recommend.feature.domain.video.base.UserFeature;
|
|
import com.tzld.piaoquan.recommend.server.common.base.RankItem;
|
|
import com.tzld.piaoquan.recommend.server.common.base.RankItem;
|
|
@@ -33,7 +34,7 @@ import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
import org.springframework.data.redis.serializer.StringRedisSerializer;
|
|
import org.springframework.data.redis.serializer.StringRedisSerializer;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
-import com.tzld.piaoquan.recommend.server.service.rank.extractor.ExtractorUtils;
|
|
|
|
|
|
+
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -48,7 +49,7 @@ public class RankStrategy4RegionMergeModelV1 extends RankService {
|
|
@ApolloJsonValue("${rank.score.merge.weightv1:}")
|
|
@ApolloJsonValue("${rank.score.merge.weightv1:}")
|
|
private Map<String, Double> mergeWeight;
|
|
private Map<String, Double> mergeWeight;
|
|
@ApolloJsonValue("${RankStrategy4DensityFilterV2:}")
|
|
@ApolloJsonValue("${RankStrategy4DensityFilterV2:}")
|
|
- private Map<String,Map<String, Map<String, String>>> filterRules = new HashMap<>();
|
|
|
|
|
|
+ private final Map<String, Map<String, Map<String, String>>> filterRules = new HashMap<>();
|
|
final private String CLASS_NAME = this.getClass().getSimpleName();
|
|
final private String CLASS_NAME = this.getClass().getSimpleName();
|
|
@Override
|
|
@Override
|
|
public List<Video> mergeAndRankFlowPoolRecall(RankParam param) {
|
|
public List<Video> mergeAndRankFlowPoolRecall(RankParam param) {
|