feat:解决冲突

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

@@ -65,7 +65,6 @@ public class NewExpInfoHelper {
                 }
                 return true;
             }
-
             return false;
         }catch (Exception e){
             return false;
@@ -176,7 +175,7 @@ public class NewExpInfoHelper {
     public static String getFlagId() {
         return flagId;
     }
-    @Value("${ad.new.exp.flag.id:0}")
+    @Value("${ad.new.exp.flag.id:647}")
     private void setFlagId(String flagId) {
         this.flagId = flagId;
     }

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/VideoAdThompsonScorerV2.java

@@ -62,6 +62,7 @@ public class VideoAdThompsonScorerV2 {
                 Map<String, Object> ext = this.extMap(statistic, "663", dto.getCpa(), null, exp663Param.getOrDefault("alpha", 1d), exp663Param.getOrDefault("beta", 10000d), null);
                 item.setExt(ext);
                 item.setScore(score);
+                item.setScore_type(663);
             }catch (Exception e){
                 log.error("svc=thompsonScorerByExp663 {}",gson.toJson(e.getStackTrace()));
             }
@@ -104,6 +105,7 @@ public class VideoAdThompsonScorerV2 {
 
                 Map<String, Object> ext = this.extMap(statistic, "664", dto.getCpa(), null, exp663Param.getOrDefault("alpha", 1d), exp663Param.getOrDefault("beta", 10000d), null);
                 item.setExt(ext);
+                item.setScore_type(664);
             }catch (Exception e){
                 log.error("svc=thompsonScorerByExp664 {}",gson.toJson(e.getStackTrace()));
             }
@@ -142,6 +144,7 @@ public class VideoAdThompsonScorerV2 {
                 }
                 score=score*dto.getCpa()*dto.getBid1()*dto.getBid2();
                 item.setScore(score);
+                item.setScore_type(665);
 
                 Map<String, Object> ext = this.extMap(statistic, "665", dto.getCpa(), null, exp663Param.getOrDefault("alpha", 1d), exp663Param.getOrDefault("beta", 10000d), null);
                 item.setExt(ext);
@@ -203,6 +206,7 @@ public class VideoAdThompsonScorerV2 {
                 }
                 score=score*dto.getCpa()*dto.getBid1()*dto.getBid2();
                 item.setScore(score);
+                item.setScore_type(666);
 
                 Map<String, Object> ext = this.extMap(statistic, "665", dto.getCpa(), exp666Param.getOrDefault("viewThreshold",5000d), exp663Param.getOrDefault("alpha", 1d),
                         exp663Param.getOrDefault("beta", 10000d), exp666Param.getOrDefault("beta_k",9d));

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -1,6 +1,8 @@
 package com.tzld.piaoquan.ad.engine.service.score.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.tzld.piaoquan.ad.engine.service.predict.helper.NewExpInfoHelper;
+import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
 import com.tzld.piaoquan.ad.engine.service.log.LogHubService;
 import com.tzld.piaoquan.ad.engine.service.score.VideoAdThompsonScorerV2;
 import com.tzld.piaoquan.ad.engine.service.score.container.AdCreativeFeatureContainer;
@@ -239,16 +241,25 @@ public class RankServiceImpl implements RankService {
                 expCodes.add(expCode);
             }
         }
-
+        ThresholdPredictModelParam modelParam = ThresholdPredictModelParam.builder()
+                .build();
         // 兜底方案
         List<AdRankItem> rankResult=null;
-        if(expCodes.contains("663")){
+        if(expCodes.contains("663")||
+                (expCodes.contains(NewExpInfoHelper.flagId)&&NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
+                        request.getAppType().toString(),request.getNewExpGroup(),"663",modelParam))){
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp663(param, request.getAdIdList());
-        }else if(expCodes.contains("664")){
+        }else if(expCodes.contains("664")||
+                (expCodes.contains(NewExpInfoHelper.flagId)&&NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
+                        request.getAppType().toString(),request.getNewExpGroup(),"664",modelParam))){
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp664(param, request.getAdIdList());
-        }else if(expCodes.contains("665")){
+        }else if(expCodes.contains("665")||
+                (expCodes.contains(NewExpInfoHelper.flagId)&&NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
+                        request.getAppType().toString(),request.getNewExpGroup(),"665",modelParam))){
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp665(param, request.getAdIdList());
-        }else if(expCodes.contains("666")){
+        }else if(expCodes.contains("666")||
+                (expCodes.contains(NewExpInfoHelper.flagId)&&NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
+                        request.getAppType().toString(),request.getNewExpGroup(),"666",modelParam))){
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp666(param, request.getAdIdList());
         }