Merge branch 'refs/heads/dev-xym-calibration-dnn1' into pre-master

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

@@ -50,9 +50,6 @@ public abstract class RankStrategyBasic implements RankStrategy {
     @Value("${calibration:ctcvr.exp:779}")
     protected String calibrationCtcvrExp;
 
-    @ApolloJsonValue("${calibration.view.count:5000}")
-    protected Integer calibrationViewCount;
-
     @Value("${correct.cpa.exp.1:}")
     protected String correctCpaExp1;
 
@@ -743,9 +740,6 @@ public abstract class RankStrategyBasic implements RankStrategy {
         calibrationModelCtcvrData.setPCtcvr(pCtcvr);
         for (AdRankItem item : adRankItems) {
             item.getExt().put("calibrationModelCtcvrData", JSONObject.toJSONString(calibrationModelCtcvrData));
-            if (view == null || view < calibrationViewCount) {
-                continue;
-            }
             if (pCtcvr == null || pCtcvr == 0.0 || realCtcvr == null || realCtcvr == 0.0) {
                 continue;
             }