Merge branch 'master' into feature_gufengshou_20240207_predict_threshold_pid

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

@@ -66,10 +66,16 @@ public class PredictModelServiceImpl implements PredictModelService {
         String[] withoutAdVideoIdsArr=withoutAdVideoIds.split(",");
         for(String videoId:withoutAdVideoIdsArr){
             if(videoId.equals(requestParam.getVideoId()+"")){
-                Map<String,Object> result=new HashMap<>();
-                result.put("ad_predict", 1);
-                result.put("no_ad_strategy", "no_ad_with_video_in_white_list");
-                return result;
+                if(requestParam.getAppType().equals(0)
+                        ||requestParam.getAppType().equals(4)
+                        ||requestParam.getAppType().equals(5)
+                        ||requestParam.getAppType().equals(21)
+                ){
+                    Map<String,Object> result=new HashMap<>();
+                    result.put("ad_predict", 1);
+                    result.put("no_ad_strategy", "no_ad_with_video_in_white_list");
+                    return result;
+                }
             }
         }
         boolean isHit = false;