Merge branch 'feature_gufengshou_20240306_pid_v3' into pre-master

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

@@ -166,11 +166,11 @@ public class PidLambdaContainer {
 
     private  Double getLatestHourLambda(String[] cols){
         try {
-            Double pctr=Double.parseDouble(cols[1]);
-            Double pcvr=Double.parseDouble(cols[2]);
-            Double ctr=Double.parseDouble(cols[3]);
-            Double cvr=Double.parseDouble(cols[4]);
-            Double lambdaNew=null;
+            Double pctr=Double.parseDouble(cols[9]);
+            Double pcvr=Double.parseDouble(cols[10]);
+            Double ctr=Double.parseDouble(cols[11]);
+            Double cvr=Double.parseDouble(cols[12]);
+            Double lambdaNew=1d;
             if((pctr*pcvr)==0d||ctr*cvr==0d){
                 lambdaNew=1d;
             }else {
@@ -188,11 +188,11 @@ public class PidLambdaContainer {
 
     private  Double getTodayLambda(String[] cols){
         try {
-            Double pctr=Double.parseDouble(cols[9]);
-            Double pcvr=Double.parseDouble(cols[10]);
-            Double ctr=Double.parseDouble(cols[11]);
-            Double cvr=Double.parseDouble(cols[12]);
-            Double lambdaNew=null;
+            Double pctr=Double.parseDouble(cols[5]);
+            Double pcvr=Double.parseDouble(cols[6]);
+            Double ctr=Double.parseDouble(cols[7]);
+            Double cvr=Double.parseDouble(cols[8]);
+            Double lambdaNew=1d;
             if((pctr*pcvr)==0d||ctr*cvr==0d){
                 lambdaNew=1d;
             }else {
@@ -209,11 +209,11 @@ public class PidLambdaContainer {
 
     private  Double getYesterdayLambda(String[] cols){
         try {
-            Double pctr=Double.parseDouble(cols[5]);
-            Double pcvr=Double.parseDouble(cols[6]);
-            Double ctr=Double.parseDouble(cols[7]);
-            Double cvr=Double.parseDouble(cols[8]);
-            Double lambdaNew=null;
+            Double pctr=Double.parseDouble(cols[1]);
+            Double pcvr=Double.parseDouble(cols[2]);
+            Double ctr=Double.parseDouble(cols[3]);
+            Double cvr=Double.parseDouble(cols[4]);
+            Double lambdaNew=1d;
             if((pctr*pcvr)==0d||ctr*cvr==0d){
                 lambdaNew=1d;
             }else {