适配新实验系统--添加分流实验

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/helper/NewExpInfoHelper.java

@@ -14,6 +14,7 @@ public class NewExpInfoHelper {
 
     public static Map<String,Set<String>> appExpIdCache=new HashMap<>();
     public static Map<String,Exp> expIdAndRangeCache=new HashMap<>();
+    public static String flagId;
 
     @Value("${new.exp,config.v2:[]}")
     private void setNewExpInfo(String str){
@@ -159,4 +160,12 @@ public class NewExpInfoHelper {
             this.param = param;
         }
     }
+
+    public static String getFlagId() {
+        return flagId;
+    }
+    @Value("${ad.new.exp.flag.id:0}")
+    private void setFlagId(String flagId) {
+        this.flagId = flagId;
+    }
 }

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -212,8 +212,8 @@ public class PredictModelServiceImpl implements PredictModelService {
         modelParam.addUserExtraFuture("shareType",shareType);
         setExtraParam(modelParam);
 
-          if(expCodes.contains("599")|| NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
-                  requestParam.getAppType().toString(),requestParam.getNewExpGroup(),"599",modelParam)){
+          if(expCodes.contains("599")|| (expCodes.contains(NewExpInfoHelper.flagId)&&NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
+                  requestParam.getAppType().toString(),requestParam.getNewExpGroup(),"599",modelParam))){
 //        if(randomModelExpCode!=null){
 //            modelParam.addUserExtraFuture("randomModelKey",ExpCodeEnum.valueOfExpCode(randomModelExpCode).getRandomModelKey());
             result = ThresholdModelContainer.
@@ -221,8 +221,8 @@ public class PredictModelServiceImpl implements PredictModelService {
                     .predict(modelParam);
         }else if(inExpList(expCodes,adPredictImmersionExpCode)
                   ||
-                  NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
-                          requestParam.getAppType().toString(),requestParam.getNewExpGroup(),"607",modelParam)){
+                  (expCodes.contains(NewExpInfoHelper.flagId)&&NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
+                          requestParam.getAppType().toString(),requestParam.getNewExpGroup(),"607",modelParam))){
 //        if(randomModelExpCode!=null){
 //            modelParam.addUserExtraFuture("randomModelKey",ExpCodeEnum.valueOfExpCode(randomModelExpCode).getRandomModelKey());
             result = ThresholdModelContainer.