Merge branch 'feature_gufengshou_20240407_new_exp_sys' of algorithm/ad-engine into master

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

@@ -56,7 +56,10 @@ public class NewExpInfoHelper {
             if(appExpIdCache.get(appId)==null||!appExpIdCache.get(appId).contains(expId)){
                 return false;
             }
-            if(expIdAndRangeCache.get(expId).getRange()[0]<=groupNumber&&expIdAndRangeCache.get(expId).getRange()[1]>=groupNumber){
+            if((expIdAndRangeCache.get(expId).getAllEnter()&&groupNumber<0)
+                    ||(
+                    expIdAndRangeCache.get(expId).getRange()[0]<=groupNumber&&expIdAndRangeCache.get(expId).getRange()[1]>=groupNumber)
+            ){
                 for(Map.Entry<String,Object> entry:expIdAndRangeCache.get(expId).getParam().entrySet()){
                     modelParam.getExtraParam().put(entry.getKey(),entry.getValue());
                 }
@@ -134,6 +137,15 @@ public class NewExpInfoHelper {
         private String expId;
         private int[] range;
 
+        public Boolean getAllEnter() {
+            return allEnter;
+        }
+
+        public void setAllEnter(Boolean allEnter) {
+            this.allEnter = allEnter;
+        }
+
+        private Boolean allEnter;
         private Map<String,Object> param;
 
         public String getExpId() {