增加sum数据

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

@@ -2969,30 +2969,41 @@ public class DataDashboardService {
         CoverStatisticDataExport articleTestFirst = new CoverStatisticDataExport(dateStr, "文章", "实验组", "头条");
         CoverStatisticDataExport articleTestSecond = new CoverStatisticDataExport(dateStr, "文章", "实验组", "次条");
         CoverStatisticDataExport articleTestLast = new CoverStatisticDataExport(dateStr, "文章", "实验组", "3-8条");
+        CoverStatisticDataExport articleTestSum = new CoverStatisticDataExport(dateStr, "文章", "实验组", "sum");
 
         CoverStatisticDataExport articleBaseFirst = new CoverStatisticDataExport(dateStr, "文章", "base组", "头条");
         CoverStatisticDataExport articleBaseSecond = new CoverStatisticDataExport(dateStr, "文章", "base组", "次条");
         CoverStatisticDataExport articleBaseLast = new CoverStatisticDataExport(dateStr, "文章", "base组", "3-8条");
+        CoverStatisticDataExport articleBaseSum = new CoverStatisticDataExport(dateStr, "文章", "base组", "sum");
+
 
         CoverStatisticDataExport articleMinimumFirst = new CoverStatisticDataExport(dateStr, "文章", "兜底组", "头条");
         CoverStatisticDataExport articleMinimumSecond = new CoverStatisticDataExport(dateStr, "文章", "兜底组", "次条");
         CoverStatisticDataExport articleMinimumLast = new CoverStatisticDataExport(dateStr, "文章", "兜底组", "3-8条");
+        CoverStatisticDataExport articleMinimumSum = new CoverStatisticDataExport(dateStr, "文章", "兜底组", "sum");
 
-        CoverStatisticDataExport articleSumFirst = new CoverStatisticDataExport(dateStr, "文章", "sum", "sum");
+        CoverStatisticDataExport articleSum = new CoverStatisticDataExport(dateStr, "文章", "sum", "sum");
 
         CoverStatisticDataExport videoTestFirst = new CoverStatisticDataExport(dateStr, "视频", "实验组", "头条");
         CoverStatisticDataExport videoTestSecond = new CoverStatisticDataExport(dateStr, "视频", "实验组", "次条");
         CoverStatisticDataExport videoTestLast = new CoverStatisticDataExport(dateStr, "视频", "实验组", "3-8条");
+        CoverStatisticDataExport videoTestSum = new CoverStatisticDataExport(dateStr, "视频", "实验组", "sum");
+
 
         CoverStatisticDataExport videoBaseFirst = new CoverStatisticDataExport(dateStr, "视频", "base组", "头条");
         CoverStatisticDataExport videoBaseSecond = new CoverStatisticDataExport(dateStr, "视频", "base组", "次条");
         CoverStatisticDataExport videoBaseLast = new CoverStatisticDataExport(dateStr, "视频", "base组", "3-8条");
+        CoverStatisticDataExport videoBaseSum = new CoverStatisticDataExport(dateStr, "视频", "base组", "sum");
+
 
         CoverStatisticDataExport videoMinimumFirst = new CoverStatisticDataExport(dateStr, "视频", "兜底组", "头条");
         CoverStatisticDataExport videoMinimumSecond = new CoverStatisticDataExport(dateStr, "视频", "兜底组", "次条");
         CoverStatisticDataExport videoMinimumLast = new CoverStatisticDataExport(dateStr, "视频", "兜底组", "3-8条");
+        CoverStatisticDataExport videoMinimumSum = new CoverStatisticDataExport(dateStr, "视频", "兜底组", "sum");
+
+        CoverStatisticDataExport videoSum = new CoverStatisticDataExport(dateStr, "视频", "sum", "sum");
+
 
-        CoverStatisticDataExport videoSumFirst = new CoverStatisticDataExport(dateStr, "视频", "sum", "sum");
 
 
         Long start = DateUtils.getStartOfDay(dateStr, "yyyyMMdd");
@@ -3180,25 +3191,44 @@ public class DataDashboardService {
                 }
             }
         }
+        sum(articleTestSum, articleTestFirst, articleTestSecond, articleTestLast);
+        sum(articleBaseSum, articleBaseFirst, articleBaseSecond, articleBaseLast);
+        sum(articleMinimumSum, articleMinimumFirst, articleMinimumSecond, articleMinimumLast);
+        sum(articleSum, articleTestSum, articleBaseSum, articleMinimumSum);
+
+        sum(videoTestSum, videoTestFirst, videoTestSecond, videoTestLast);
+        sum(videoBaseSum, videoBaseFirst, videoBaseSecond, videoBaseLast);
+        sum(videoMinimumSum, videoMinimumFirst, videoMinimumSecond, videoMinimumLast);
+        sum(videoSum, videoTestSum, videoBaseSum, videoMinimumSum);
+
         result.add(rate(articleTestFirst));
         result.add(rate(articleTestSecond));
         result.add(rate(articleTestLast));
+        result.add(rate(articleTestSum));
         result.add(rate(articleBaseFirst));
         result.add(rate(articleBaseSecond));
         result.add(rate(articleBaseLast));
+        result.add(rate(articleBaseSum));
         result.add(rate(articleMinimumFirst));
         result.add(rate(articleMinimumSecond));
         result.add(rate(articleMinimumLast));
+        result.add(rate(articleMinimumSum));
+        result.add(rate(articleSum));
+
 
         result.add(rate(videoTestFirst));
         result.add(rate(videoTestSecond));
         result.add(rate(videoTestLast));
+        result.add(rate(videoTestSum));
         result.add(rate(videoBaseFirst));
         result.add(rate(videoBaseSecond));
         result.add(rate(videoBaseLast));
+        result.add(rate(videoBaseSum));
         result.add(rate(videoMinimumFirst));
         result.add(rate(videoMinimumSecond));
         result.add(rate(videoMinimumLast));
+        result.add(rate(videoMinimumSum));
+        result.add(rate(videoSum));
 
         return result;
     }
@@ -3234,6 +3264,21 @@ public class DataDashboardService {
         }
     }
 
+    private void sum(CoverStatisticDataExport sumCoverStatisticDataExport,
+                                         CoverStatisticDataExport coverStatisticDataExport1,
+                                         CoverStatisticDataExport coverStatisticDataExport2,
+                                         CoverStatisticDataExport coverStatisticDataExport3) {
+        sumCoverStatisticDataExport.setFans(coverStatisticDataExport1.getFans() + coverStatisticDataExport2.getFans() + coverStatisticDataExport3.getFans());
+        sumCoverStatisticDataExport.setPublishCount(coverStatisticDataExport1.getPublishCount() + coverStatisticDataExport2.getPublishCount() + coverStatisticDataExport3.getPublishCount());
+        sumCoverStatisticDataExport.setShowViewCount(coverStatisticDataExport1.getShowViewCount() + coverStatisticDataExport2.getShowViewCount() + coverStatisticDataExport3.getShowViewCount());
+        sumCoverStatisticDataExport.setAllFirstLevel(coverStatisticDataExport1.getAllFirstLevel() + coverStatisticDataExport2.getAllFirstLevel() + coverStatisticDataExport3.getAllFirstLevel());
+        sumCoverStatisticDataExport.setOneFirstLevel(coverStatisticDataExport1.getOneFirstLevel() + coverStatisticDataExport2.getOneFirstLevel() + coverStatisticDataExport3.getOneFirstLevel());
+        sumCoverStatisticDataExport.setTwoFirstLevel(coverStatisticDataExport1.getTwoFirstLevel() + coverStatisticDataExport2.getTwoFirstLevel() + coverStatisticDataExport3.getTwoFirstLevel());
+        sumCoverStatisticDataExport.setAllFission0(coverStatisticDataExport1.getAllFission0() + coverStatisticDataExport2.getAllFission0() + coverStatisticDataExport3.getAllFission0());
+        sumCoverStatisticDataExport.setOneFission0(coverStatisticDataExport1.getOneFission0() + coverStatisticDataExport2.getOneFission0() + coverStatisticDataExport3.getOneFission0());
+        sumCoverStatisticDataExport.setTwoFission0(coverStatisticDataExport1.getTwoFission0() + coverStatisticDataExport2.getTwoFission0() + coverStatisticDataExport3.getTwoFission0());
+    }
+
     private CoverStatisticDataExport rate(CoverStatisticDataExport coverStatisticDataExport) {
         if (coverStatisticDataExport.getShowViewCount() != null && coverStatisticDataExport.getFans() != null) {
             coverStatisticDataExport.setShowViewRate((double) coverStatisticDataExport.getShowViewCount() / coverStatisticDataExport.getFans());