Merge branch 'feature_gufengshou_20240403_ad_immersion_with_head_ad' into pre-master

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

@@ -197,7 +197,7 @@ public class PredictModelServiceImpl implements PredictModelService {
             result = ThresholdModelContainer.
                     getThresholdPredictModel("random")
                     .predict(modelParam);
-        }else if(expCodes.contains(adPredictImmersionExpCode)){
+        }else if(inExpList(expCodes,adPredictImmersionExpCode)){
 //        if(randomModelExpCode!=null){
 //            modelParam.addUserExtraFuture("randomModelKey",ExpCodeEnum.valueOfExpCode(randomModelExpCode).getRandomModelKey());
             result = ThresholdModelContainer.
@@ -265,4 +265,14 @@ public class PredictModelServiceImpl implements PredictModelService {
         }
     }
 
+
+    boolean inExpList(Set<String> set,String expCodes){
+        String[] expArr=expCodes.split(",");
+        for(String str:expArr){
+            if(set.contains(str)){
+                return true;
+            }
+        }
+        return false;
+    }
 }