Merge branch 'master' into pre-master

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

@@ -176,6 +176,10 @@ public class PidLambdaContainer {
             }else {
                 lambdaNew=cvr*ctr/(pctr*pctr);
             }
+            //避免异常数据
+            if(lambdaNew>5){
+                lambdaNew=1d;
+            }
             return lambdaNew;
         }catch (Exception e){
             return 1d;
@@ -194,6 +198,9 @@ public class PidLambdaContainer {
             }else {
                 lambdaNew=cvr*ctr/(pctr*pctr);
             }
+            if(lambdaNew>3){
+                lambdaNew=1d;
+            }
             return lambdaNew;
         }catch (Exception e){
             return 1d;
@@ -212,6 +219,9 @@ public class PidLambdaContainer {
             }else {
                 lambdaNew=cvr*ctr/(pctr*pctr);
             }
+            if(lambdaNew>3){
+                lambdaNew=1d;
+            }
             return lambdaNew;
         }catch (Exception e){
             return 1d;