Merge branch 'dev-xym-fix' of algorithm/ad-engine into master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy688.java

@@ -111,9 +111,12 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         Map<String, String> e1Feature = userFeature.getOrDefault("alg_mid_feature_return_tags", new HashMap<>());
         Map<String, String> e2Feature = userFeature.getOrDefault("alg_mid_feature_share_tags", new HashMap<>());
 
-        userFeatureMap.put("brand", scoreParam.getRequestContext().getMachineinfoBrand().toUpperCase());
-        userFeatureMap.put("region", request.getRegion());
-        userFeatureMap.put("city", request.getCity());
+        userFeatureMap.put("brand", scoreParam.getRequestContext().getMachineinfoBrand().equalsIgnoreCase("-1") ?
+                "" : scoreParam.getRequestContext().getMachineinfoBrand().toUpperCase());
+        userFeatureMap.put("region", Objects.equals(scoreParam.getRequestContext().getRegion(), "-1") ?
+                "" : scoreParam.getRequestContext().getRegion());
+        userFeatureMap.put("city", Objects.equals(scoreParam.getRequestContext().getCity(), "-1") ?
+                "" : scoreParam.getRequestContext().getCity());
         userFeatureMap.put("vid", String.valueOf(request.getVideoId()));
         userFeatureMap.put("cate1", d3Feature.get("merge_first_level_cate"));
         userFeatureMap.put("cate2", d3Feature.get("merge_second_level_cate"));