Merge branch 'feature_gufengshou_20240401_pid_v6'

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

@@ -117,13 +117,18 @@ public class VlogMergeEcpmScorer extends BaseLRModelScorer {
 //            if(isTfType){
 //                ecpm = cpa * bid1 * bid2 * pcvr * pctr * 1000d;
 //            }else {
+            cpa=cpa*item.getPidLambda();
+            if(cpa<0.1){
+                cpa=0.1;
+            }
             ecpm = cpa* bid1 * bid2 * pcvr * pctr * 1000d;
-            ecpm2 = item.getPidLambda()* bid1 * bid2 * pcvr * pctr * 1000d;
+//            ecpm = item.getPidLambda()* bid1 * bid2 * pcvr * pctr * 1000d;
+//            ecpm2 = item.getPidLambda()* bid1 * bid2 * pcvr * pctr * 1000d;
 //            }
 //            ecpm = cpa * bid1 * bid2 * pcvr * pctr * 1000d;
             item.setEcpm1(ecpm/1000d);
             item.setScore(ecpm/1000d);
-            item.setEcpm2(ecpm2/1000d);
+            item.setEcpm2(ecpm/1000d);
         } catch (Exception e) {
             LOGGER.error("merge Ecpm Score: {} error", "");
             item.setScore(0.0);

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

@@ -146,29 +146,6 @@ public class RankServiceImpl implements RankService {
             rankItems=new LinkedList<>(cache.values());
         }
         double lambda=-1d;
-//        for(AdRankItem item:rankItems){
-//            try {
-////                AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()+"").get(0);
-//                AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()).get(0);
-//                item.setBid1(dto.getBid1());
-//                item.setBid2(dto.getBid2());
-//                lambda=PidLambdaContainer.getPidLambda(item.getAdId());
-//                if(lambda<0){
-//                    item.setCpa(dto.getCpa());
-//                    item.setPidLambda(0.6);
-//                }else {
-//                    if(dto.getCpa()>1&&lambda<=1){
-//                        lambda=2d;
-//                    }
-//                    item.setCpa(lambda);
-//                    item.setPidLambda(1d);
-//                }
-//
-//            }catch (Exception e){
-//                log.error("rankItems info error itemId={}",item.getAdId());
-//                e.printStackTrace();
-//            }
-//        }
         for(AdRankItem item:rankItems){
             try {
 //                AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()+"").get(0);
@@ -178,13 +155,13 @@ public class RankServiceImpl implements RankService {
                 lambda=PidLambdaContainer.getPidLambda(item.getAdId());
                 if(lambda<0){
                     item.setCpa(dto.getCpa());
-                    item.setPidLambda(dto.getCpa()*0.6);
+                    item.setPidLambda(0.6);
                 }else {
                     if(dto.getCpa()>1&&lambda<=1){
                         lambda=2d;
                     }
-                    item.setCpa(dto.getCpa());
-                    item.setPidLambda(lambda);
+                    item.setCpa(lambda);
+                    item.setPidLambda(1d);
                 }
 
             }catch (Exception e){
@@ -192,6 +169,29 @@ public class RankServiceImpl implements RankService {
                 e.printStackTrace();
             }
         }
+//        for(AdRankItem item:rankItems){
+//            try {
+////                AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()+"").get(0);
+//                AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()).get(0);
+//                item.setBid1(dto.getBid1());
+//                item.setBid2(dto.getBid2());
+//                lambda=PidLambdaContainer.getPidLambda(item.getAdId());
+//                if(lambda<0){
+//                    item.setCpa(dto.getCpa());
+//                    item.setPidLambda(dto.getCpa()*0.6);
+//                }else {
+//                    if(dto.getCpa()>1&&lambda<=1){
+//                        lambda=2d;
+//                    }
+//                    item.setCpa(dto.getCpa());
+//                    item.setPidLambda(lambda);
+//                }
+//
+//            }catch (Exception e){
+//                log.error("rankItems info error itemId={}",item.getAdId());
+//                e.printStackTrace();
+//            }
+//        }
         List<AdRankItem> rankResult;
         if(rankItems==null|| rankItems.size()==0){
             rankItems=new LinkedList<>();
@@ -202,26 +202,26 @@ public class RankServiceImpl implements RankService {
                 item.setAdId(dto.getCreativeId());
                 item.setItemFeature(new AdItemFeature());
                 lambda=PidLambdaContainer.getPidLambda(item.getAdId());
-//                if(lambda<0){
-//                    item.setCpa(dto.getCpa());
-//                    item.setPidLambda(0.6);
-//                }else {
-//                    if(dto.getCpa()>1&&lambda<=1){
-//                        lambda=2d;
-//                    }
-//                    item.setCpa(lambda);
-//                    item.setPidLambda(1d);
-//                }
                 if(lambda<0){
                     item.setCpa(dto.getCpa());
-                    item.setPidLambda(dto.getCpa()*0.6);
+                    item.setPidLambda(0.6);
                 }else {
                     if(dto.getCpa()>1&&lambda<=1){
                         lambda=2d;
                     }
-                    item.setCpa(dto.getCpa());
-                    item.setPidLambda(lambda);
+                    item.setCpa(lambda);
+                    item.setPidLambda(1d);
                 }
+//                if(lambda<0){
+//                    item.setCpa(dto.getCpa());
+//                    item.setPidLambda(dto.getCpa()*0.6);
+//                }else {
+//                    if(dto.getCpa()>1&&lambda<=1){
+//                        lambda=2d;
+//                    }
+//                    item.setCpa(dto.getCpa());
+//                    item.setPidLambda(lambda);
+//                }
 //                item.setCpa(dto.getCpa());
 //                item.setPidLambda(PidLambdaContainer.getPidLambda(item.getAdId()));
                 rankItems.add(item);