Merge branch 'feature_gufengshou_20240107_predict_abInfo' into feature_gufengshou_20240117_fix530bug

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/container/AbTestConfigContainer.java

@@ -19,8 +19,8 @@ public class AbTestConfigContainer {
     @Value("${ad.abtest.time.plan.code:555}")
     String adTestCode;
 
-
-    Map<String,List<Tuple<Integer>>> adTimePlanMap=new HashMap<>();
+//List<Tuple<Integer>>
+    Map<String,List<JSONObject>> adTimePlanMap=new HashMap<>();
     @PostConstruct
     public void initContainer(){
         Timer timer = new Timer();
@@ -61,8 +61,8 @@ public class AbTestConfigContainer {
 
     public Boolean inWithoutAdTime(String code,Integer hourOfDay){
         Boolean flag=false;
-        for(Tuple<Integer> tuple:adTimePlanMap.getOrDefault(code,new ArrayList<>())){
-            if(tuple.getX()<=hourOfDay&&hourOfDay<tuple.getY()){
+        for(JSONObject object:adTimePlanMap.getOrDefault(code,new ArrayList<>())){
+            if(object.getInteger("x")<=hourOfDay&&hourOfDay<object.getInteger("y")){
                 return true;
             }
         }

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

@@ -53,7 +53,7 @@ public class PredictModelServiceImpl implements PredictModelService {
             result.put("ad_predict", 1);
             result.put("no_ad_strategy","no_ad_time");
             return result;
-        }else  if(hourOfDay<8&&hourOfDay>=0){
+        }else  if(!container.containsCode(requestParam.getAbTestCode())&&(hourOfDay<8&&hourOfDay>=0)){
             result.put("ad_predict", 1);
             result.put("no_ad_strategy","no_ad_time");
             return result;