rebase master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RecommendParam.java

@@ -4,13 +4,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-<<<<<<< HEAD
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-=======
 import java.util.Set;
->>>>>>> 3320d41 (ab test)
 
 /**
  * @author dyp
@@ -35,7 +31,6 @@ public class RecommendParam {
     private String mid;
     private int size;
     private String uid;
-<<<<<<< HEAD
 
     // 风险过滤
     private int expansionFactor;
@@ -43,11 +38,9 @@ public class RecommendParam {
     private Map<Integer, List<String>> appRegionFiltered;
     private List<Long> videosWithRisk;
     private String regionCode;
-=======
     private MachineInfo machineInfo;
     private String province;
     private String city;
     private Set<String> abExpCodes;
 
->>>>>>> bee54d3 (request context)
 }

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

@@ -24,6 +24,7 @@ import com.tzld.piaoquan.recommend.server.service.recall.RecallService;
 import com.tzld.piaoquan.recommend.server.service.recall.strategy.*;
 import com.tzld.piaoquan.recommend.server.util.CommonCollectionUtils;
 import com.tzld.piaoquan.recommend.server.util.JSONUtils;
+import com.tzld.piaoquan.recommend.server.util.ParserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomUtils;
@@ -37,7 +38,6 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import com.tzld.piaoquan.recommend.server.util.ParserUtils;
 
 /**
  * @author dyp
@@ -277,7 +277,6 @@ public class RecommendService {
             }
         }
 
-<<<<<<< HEAD
         // 风险过滤
         List<String> keysRisk = new ArrayList<>();
         keysRisk.add("RISK_SHIELD_FILTER_RULE_V1_JSON");
@@ -289,12 +288,12 @@ public class RecommendService {
         String RISK_SHIELD_FILTER_VIDEO_V1_STR = "";
         String RISK_SHIELD_FILTER_EXPANSION_FACTOR_INT = "";
         String RISK_SHIELD_FILTER_FLAG_BOOL = "";
-        if (valuesRisk != null && valuesRisk.size() == 4){
+        if (valuesRisk != null && valuesRisk.size() == 4) {
             RISK_SHIELD_FILTER_RULE_V1_JSON = valuesRisk.get(0);
             RISK_SHIELD_FILTER_VIDEO_V1_STR = valuesRisk.get(1);
             RISK_SHIELD_FILTER_EXPANSION_FACTOR_INT = valuesRisk.get(2);
             RISK_SHIELD_FILTER_FLAG_BOOL = valuesRisk.get(3);
-        }else{
+        } else {
             log.error("risk rule read redis is wrong");
         }
         Map<Integer, List<String>> appRegionFiltered = ParserUtils.parseJsonForRiskRule(RISK_SHIELD_FILTER_RULE_V1_JSON);
@@ -325,7 +324,7 @@ public class RecommendService {
         param.setVideosWithRisk(videosWithRisk);
         param.setExpansionFactor(expansionFactor);
         param.setRiskFilterFlag(riskFilterFlag);
-=======
+
         if (request.hasMachineInfo()) {
             MachineInfoProto machineInfoProto = request.getMachineInfo();
             MachineInfo machineInfo = new MachineInfo();
@@ -337,7 +336,6 @@ public class RecommendService {
             machineInfo.setWechatVersion(machineInfoProto.getWechatVersion());
             param.setMachineInfo(machineInfo);
         }
->>>>>>> bee54d3 (request context)
 
 
         return param;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallService.java

@@ -110,24 +110,13 @@ public class RecallService implements ApplicationContextAware {
             strategies.add(strategyMap.get(SimHotVideoRecallStrategy.class.getSimpleName()));
         } else if (param.getAbCode().equals("60068")
                 || param.getAbCode().equals("60081")
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> e9fc74f (write to redis & repair conflicts)
                 || param.getAbCode().equals("60084")
                 || param.getAbCode().equals("60092")
                 || param.getAbCode().equals("60093")
                 || param.getAbCode().equals("60094")
                 || param.getAbCode().equals("60096")
-<<<<<<< HEAD
                 || param.getAbCode().equals("60095")
                 || param.getAbCode().equals("60097")) {
-=======
-                || param.getAbCode().equals("60084")) {
->>>>>>> 78c80c0 (offline write samples and to redis)
-=======
-                || param.getAbCode().equals("60095")) {
->>>>>>> e9fc74f (write to redis & repair conflicts)
             strategies.add(strategyMap.get(SimHotVideoRecallStrategy.class.getSimpleName()));
             strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
         }