|  | @@ -110,6 +110,7 @@ public class PredictModelServiceImpl implements PredictModelService {
 | 
	
		
			
				|  |  |                      condition2
 | 
	
		
			
				|  |  |                      &&
 | 
	
		
			
				|  |  |                      abTestConfigContainer.inWithoutAdTime(configMap,requestParam.getAbTestCode(),hourOfDay)){
 | 
	
		
			
				|  |  | +                // 开启555 & 555的配置包含abcode & 命中555为这个code配置的不出广告时间
 | 
	
		
			
				|  |  |                  result.put("ad_predict", 1);
 | 
	
		
			
				|  |  |                  result.put("no_ad_strategy", "no_ad_time_with_time_plan");
 | 
	
		
			
				|  |  |                  return result;
 | 
	
	
		
			
				|  | @@ -117,6 +118,7 @@ public class PredictModelServiceImpl implements PredictModelService {
 | 
	
		
			
				|  |  |                      (!condition1 || (condition1 && !condition2))
 | 
	
		
			
				|  |  |                              &&
 | 
	
		
			
				|  |  |                              (0 <= hourOfDay && hourOfDay < 8)) {
 | 
	
		
			
				|  |  | +                // 0点到8点 && (未开启555 || 555配置不包含abcode)
 | 
	
		
			
				|  |  |                  result.put("ad_predict", 1);
 | 
	
		
			
				|  |  |                  result.put("no_ad_strategy", "no_ad_time_with_fixed_time");
 | 
	
		
			
				|  |  |                  return result;
 | 
	
	
		
			
				|  | @@ -128,6 +130,7 @@ public class PredictModelServiceImpl implements PredictModelService {
 | 
	
		
			
				|  |  |              String shareType =null;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              String[] appIdArr=oldExpGroupAppId.split(",");
 | 
	
		
			
				|  |  | +            // 新老实验系统
 | 
	
		
			
				|  |  |              List<String> appIdList=Arrays.asList(appIdArr);
 | 
	
		
			
				|  |  |              if(appIdList.contains(requestParam.getAppType().toString())){
 | 
	
		
			
				|  |  |  //            if(appIdArr.contains(requestParam.getAppType())){
 | 
	
	
		
			
				|  | @@ -219,11 +222,11 @@ public class PredictModelServiceImpl implements PredictModelService {
 | 
	
		
			
				|  |  |              modelParam.addUserExtraFuture("shareType",shareType);
 | 
	
		
			
				|  |  |              setExtraParam(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());
 | 
	
		
			
				|  |  | +                // NewExpInfoHelper.flagId   647
 | 
	
		
			
				|  |  |                  result = ThresholdModelContainer.
 | 
	
		
			
				|  |  |                          getThresholdPredictModel("random")
 | 
	
		
			
				|  |  |                          .predict(modelParam);
 | 
	
	
		
			
				|  | @@ -231,8 +234,7 @@ public class PredictModelServiceImpl implements PredictModelService {
 | 
	
		
			
				|  |  |                      ||
 | 
	
		
			
				|  |  |                      (expCodes.contains(NewExpInfoHelper.flagId)&&NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
 | 
	
		
			
				|  |  |                              requestParam.getAppType().toString(),requestParam.getNewExpGroup(),"607",modelParam))){
 | 
	
		
			
				|  |  | -//        if(randomModelExpCode!=null){
 | 
	
		
			
				|  |  | -//            modelParam.addUserExtraFuture("randomModelKey",ExpCodeEnum.valueOfExpCode(randomModelExpCode).getRandomModelKey());
 | 
	
		
			
				|  |  | +                // adPredictImmersionExpCode 607 631
 | 
	
		
			
				|  |  |                  result = ThresholdModelContainer.
 | 
	
		
			
				|  |  |                          getThresholdPredictModel("immersion")
 | 
	
		
			
				|  |  |                          .predict(modelParam);
 |