Merge branch 'feature_newExp' of algorithm/recommend-server into master

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

@@ -353,28 +353,31 @@ public class RecommendService {
         }
 
 
-        Map<String, List<Layer>> layerMap = CommonCollectionUtils.toMap(expConfigs, c -> c.getAppType(),
-                c -> c.getLayers());
-        if (MapUtils.isNotEmpty(layerMap)) {
-            Map<String, Integer> bucketMap = JSONUtils.fromJson(request.getNewExpGroup(),
-                    new TypeToken<Map<String, Integer>>() {
-                    }, Collections.emptyMap());
-            if (MapUtils.isNotEmpty(bucketMap)) {
-                List<Layer> layers = layerMap.get(param.getAppType() + "");
-
-                if (CollectionUtils.isNotEmpty(layers)) {
-                    Map<String, String> expIdMap = new HashMap<>();
-                    for (Layer layer : layers) {
-                        for (Exp exp : layer.getExps()) {
-                            if (bucketMap.containsKey(layer.getLayerId())
-                                    && exp.getRange().length == 2
-                                    && exp.getRange()[0] <= bucketMap.get(layer.getLayerId())
-                                    && exp.getRange()[1] >= bucketMap.get(layer.getLayerId())) {
-                                expIdMap.put(layer.getLayerId(), exp.getExpId());
+        // TODO：hard code 为了快速做AB验证，应该由AB系统支持
+        if (newExpList.contains(param.getAppType())) {
+            Map<String, List<Layer>> layerMap = CommonCollectionUtils.toMap(expConfigs, c -> c.getAppType(),
+                    c -> c.getLayers());
+            if (MapUtils.isNotEmpty(layerMap)) {
+                Map<String, Integer> bucketMap = JSONUtils.fromJson(request.getNewExpGroup(),
+                        new TypeToken<Map<String, Integer>>() {
+                        }, Collections.emptyMap());
+                if (MapUtils.isNotEmpty(bucketMap)) {
+                    List<Layer> layers = layerMap.get(param.getAppType() + "");
+
+                    if (CollectionUtils.isNotEmpty(layers)) {
+                        Map<String, String> expIdMap = new HashMap<>();
+                        for (Layer layer : layers) {
+                            for (Exp exp : layer.getExps()) {
+                                if (bucketMap.containsKey(layer.getLayerId())
+                                        && exp.getRange().length == 2
+                                        && exp.getRange()[0] <= bucketMap.get(layer.getLayerId())
+                                        && exp.getRange()[1] >= bucketMap.get(layer.getLayerId())) {
+                                    expIdMap.put(layer.getLayerId(), exp.getExpId());
+                                }
                             }
                         }
+                        param.setExpIdMap(expIdMap);
                     }
-                    param.setExpIdMap(expIdMap);
                 }
             }
         }