Merge branch 'wyp/1219-export' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/IntermediateIndicatorsExport.java

@@ -142,40 +142,40 @@ public class IntermediateIndicatorsExport {
     private Double t2DayAverageFirstLayerFissionToViewBaseRatio = 0.0;
     // T+2日阅读Base
     private Double t2DayViewBase = 0.0;
-    // T+3日阅读量
-    private Integer t3DayViewCount = 0;
-    // T+3日首层UV
-    private Integer t3DayFirstLayerUV = 0;
-    // T+3日T+0裂变UV
-    private Integer t3DayT0FissionUV = 0;
-    // T+3日账号-文章相关性均值
-    private Double t3DayAccountArticleRelevanceAvg = 0.0;
-    // T+3日均值(阅读量/Base)
-    private Double t3DayAverageViewToBaseRatio = 0.0;
-    // T+3日均值(小程序打开率)
-    private Double t3DayAverageMiniAppOpenRate = 0.0;
-    // T+3日均值(T+0裂变率)
-    private Double t3DayAverageT0FissionRate = 0.0;
-    // T+3日均值(首层当日带回裂变人/阅读Base)
-    private Double t3DayAverageFirstLayerFissionToViewBaseRatio = 0.0;
-    // T+3日阅读Base
-    private Double t3DayViewBase = 0.0;
-    // T+3+日阅读量
-    private Integer t3PlusDayViewCount = 0;
-    // T+3+日首层UV
-    private Integer t3PlusDayFirstLayerUV = 0;
-    // T+3+日T+0裂变UV
-    private Integer t3PlusDayT0FissionUV = 0;
-    // T+3+日账号-文章相关性均值
-    private Double t3PlusDayAccountArticleRelevanceAvg = 0.0;
-    // T+3+日均值(阅读量/Base)
-    private Double t3PlusDayAverageViewToBaseRatio = 0.0;
-    // T+3+日均值(小程序打开率)
-    private Double t3PlusDayAverageMiniAppOpenRate = 0.0;
-    // T+3+日均值(T+0裂变率)
-    private Double t3PlusDayAverageT0FissionRate = 0.0;
-    // T+3+日均值(首层当日带回裂变人/阅读Base)
-    private Double t3PlusDayAverageFirstLayerFissionToViewBaseRatio = 0.0;
-    // T+3+日阅读Base
-    private Double t3PlusDayViewBase = 0.0;
+//    // T+3日阅读量
+//    private Integer t3DayViewCount = 0;
+//    // T+3日首层UV
+//    private Integer t3DayFirstLayerUV = 0;
+//    // T+3日T+0裂变UV
+//    private Integer t3DayT0FissionUV = 0;
+//    // T+3日账号-文章相关性均值
+//    private Double t3DayAccountArticleRelevanceAvg = 0.0;
+//    // T+3日均值(阅读量/Base)
+//    private Double t3DayAverageViewToBaseRatio = 0.0;
+//    // T+3日均值(小程序打开率)
+//    private Double t3DayAverageMiniAppOpenRate = 0.0;
+//    // T+3日均值(T+0裂变率)
+//    private Double t3DayAverageT0FissionRate = 0.0;
+//    // T+3日均值(首层当日带回裂变人/阅读Base)
+//    private Double t3DayAverageFirstLayerFissionToViewBaseRatio = 0.0;
+//    // T+3日阅读Base
+//    private Double t3DayViewBase = 0.0;
+//    // T+3+日阅读量
+//    private Integer t3PlusDayViewCount = 0;
+//    // T+3+日首层UV
+//    private Integer t3PlusDayFirstLayerUV = 0;
+//    // T+3+日T+0裂变UV
+//    private Integer t3PlusDayT0FissionUV = 0;
+//    // T+3+日账号-文章相关性均值
+//    private Double t3PlusDayAccountArticleRelevanceAvg = 0.0;
+//    // T+3+日均值(阅读量/Base)
+//    private Double t3PlusDayAverageViewToBaseRatio = 0.0;
+//    // T+3+日均值(小程序打开率)
+//    private Double t3PlusDayAverageMiniAppOpenRate = 0.0;
+//    // T+3+日均值(T+0裂变率)
+//    private Double t3PlusDayAverageT0FissionRate = 0.0;
+//    // T+3+日均值(首层当日带回裂变人/阅读Base)
+//    private Double t3PlusDayAverageFirstLayerFissionToViewBaseRatio = 0.0;
+//    // T+3+日阅读Base
+//    private Double t3PlusDayViewBase = 0.0;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java

@@ -1003,9 +1003,9 @@ public class DataDashboardService {
             }
             IntermediateIndicatorsExport item = resultMap.get(type);
             List<Article> list = hisPublishMap.get(data.getTitle());
+            Integer poolLevel = getArticlePoolLevel(data.getGhId(), list, small);
             list = list.stream().filter(publish -> publish.getPublishTimestamp() < (article.getPublishTimestamp() - 3600 * 8))
                     .collect(Collectors.toList());
-            Integer poolLevel = getArticlePoolLevel(data.getGhId(), list, small);
             // L1层仅统计历史发布在3-8位置文章
             if (poolLevel > 1 && "L1".equals(item.getType())) {
                 continue;
@@ -1183,24 +1183,24 @@ public class DataDashboardService {
         }
         item.setT2DayAverageFirstLayerFissionToViewBaseRatio(t2DayAverageFirstLayerFissionToViewBaseRatio);
 
-        item.setT3DayViewCount(item.getT3DayViewCount());
-        item.setT3DayFirstLayerUV(item.getT3DayFirstLayerUV());
-        item.setT3DayT0FissionUV(item.getT3DayT0FissionUV());
-        item.setT3DayAccountArticleRelevanceAvg(item.getT3DayAccountArticleRelevanceAvg());
-        item.setT3DayAverageViewToBaseRatio(item.getT3DayAverageViewToBaseRatio());
-        item.setT3DayAverageMiniAppOpenRate(item.getT3DayAverageMiniAppOpenRate());
-        item.setT3DayAverageT0FissionRate(item.getT3DayAverageT0FissionRate());
-        item.setT3DayAverageFirstLayerFissionToViewBaseRatio(item.getT3DayAverageFirstLayerFissionToViewBaseRatio());
-        item.setT3DayViewBase(item.getT3DayViewBase());
-        item.setT3PlusDayViewCount(item.getT3PlusDayViewCount());
-        item.setT3PlusDayFirstLayerUV(item.getT3PlusDayFirstLayerUV());
-        item.setT3PlusDayT0FissionUV(item.getT3PlusDayT0FissionUV());
-        item.setT3PlusDayAccountArticleRelevanceAvg(item.getT3PlusDayAccountArticleRelevanceAvg());
-        item.setT3PlusDayAverageViewToBaseRatio(item.getT3PlusDayAverageViewToBaseRatio());
-        item.setT3PlusDayAverageMiniAppOpenRate(item.getT3PlusDayAverageMiniAppOpenRate());
-        item.setT3PlusDayAverageT0FissionRate(item.getT3PlusDayAverageT0FissionRate());
-        item.setT3PlusDayAverageFirstLayerFissionToViewBaseRatio(item.getT3PlusDayAverageFirstLayerFissionToViewBaseRatio());
-        item.setT3PlusDayViewBase(item.getT3PlusDayViewBase());
+//        item.setT3DayViewCount(item.getT3DayViewCount());
+//        item.setT3DayFirstLayerUV(item.getT3DayFirstLayerUV());
+//        item.setT3DayT0FissionUV(item.getT3DayT0FissionUV());
+//        item.setT3DayAccountArticleRelevanceAvg(item.getT3DayAccountArticleRelevanceAvg());
+//        item.setT3DayAverageViewToBaseRatio(item.getT3DayAverageViewToBaseRatio());
+//        item.setT3DayAverageMiniAppOpenRate(item.getT3DayAverageMiniAppOpenRate());
+//        item.setT3DayAverageT0FissionRate(item.getT3DayAverageT0FissionRate());
+//        item.setT3DayAverageFirstLayerFissionToViewBaseRatio(item.getT3DayAverageFirstLayerFissionToViewBaseRatio());
+//        item.setT3DayViewBase(item.getT3DayViewBase());
+//        item.setT3PlusDayViewCount(item.getT3PlusDayViewCount());
+//        item.setT3PlusDayFirstLayerUV(item.getT3PlusDayFirstLayerUV());
+//        item.setT3PlusDayT0FissionUV(item.getT3PlusDayT0FissionUV());
+//        item.setT3PlusDayAccountArticleRelevanceAvg(item.getT3PlusDayAccountArticleRelevanceAvg());
+//        item.setT3PlusDayAverageViewToBaseRatio(item.getT3PlusDayAverageViewToBaseRatio());
+//        item.setT3PlusDayAverageMiniAppOpenRate(item.getT3PlusDayAverageMiniAppOpenRate());
+//        item.setT3PlusDayAverageT0FissionRate(item.getT3PlusDayAverageT0FissionRate());
+//        item.setT3PlusDayAverageFirstLayerFissionToViewBaseRatio(item.getT3PlusDayAverageFirstLayerFissionToViewBaseRatio());
+//        item.setT3PlusDayViewBase(item.getT3PlusDayViewBase());
     }
 
     private int getPromotionPoolLevel(String ghId, String title,