分组漏斗导出

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

@@ -20,8 +20,8 @@ public class ContentGroupFunnelExport {
     private Long videoPoolPQAuditCount;
     private Long videoPoolPQAuditPassCount;
     private Double videoPoolPQAuditPassRate;
-    private Long videoAuditPassCount;
     private Long videoAuditCount;
+    private Long videoAuditPassCount;
     private Double videoAuditPassRate;
 
     public static ContentGroupFunnelExport getDefault() {

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

@@ -2382,8 +2382,12 @@ public class DataDashboardService {
                 );
         List<Pair<String, List<Pair<String, String>>>> thank = Arrays
                 .asList(
-                        Pair.of("B", Arrays.asList(Pair.of("文章", "#FED4A4"), Pair.of("视频", "#BACEFD"))),
-                        Pair.of("C", Arrays.asList(Pair.of("SUM", "#BACEFD"),
+                        Pair.of("B", Arrays.asList(
+                                Pair.of("SUM", "#BACEFD"),
+                                Pair.of("文章", "#FED4A4"),
+                                Pair.of("视频", "#B1E8FC"))),
+                        Pair.of("C", Arrays.asList(
+                                Pair.of("SUM", "#BACEFD"),
                                 Pair.of("公众号文章", "#FED4A4"),
                                 Pair.of("头条文章", "#B1E8FC"),
                                 Pair.of("公众号视频", "#F8E6AB"),
@@ -2400,21 +2404,6 @@ public class DataDashboardService {
         Long end = start + 86400000;
         Date dateStart = DateUtils.getStartDateOfDay(start / 1000);
         Date dateEnd = DateUtils.getStartDateOfDay(end / 1000);
-        // sum
-        ContentFunnelExport sum = buildContentFunnelExport(dateStr);
-        ContentGroupFunnelExport groupSum = new ContentGroupFunnelExport();
-        BeanUtils.copyProperties(sum, groupSum);
-        groupSum.setSource("SUM");
-        if (sum.getCrawlerCount() > 0) {
-            groupSum.setProduceRate(sum.getProduceCount() * 1.0 / sum.getCrawlerCount());
-        }
-        groupSum.setCrawlerCount(sum.getCrawlerCount() + sum.getVideoPoolCrawlerCount());
-        groupSum.setVideoAuditCount(sum.getVideoAuditCount() + sum.getVideoPoolAuditCount());
-        groupSum.setVideoAuditPassCount(sum.getVideoAuditPassCount() + sum.getVideoPoolAuditPassCount());
-        if (groupSum.getVideoAuditCount() > 0) {
-            groupSum.setVideoAuditPassRate(groupSum.getVideoAuditPassCount() * 1.0 / groupSum.getVideoAuditCount());
-        }
-        result.add(groupSum);
         // 文章
         List<ChannelEnum> channelList = Arrays.asList(ChannelEnum.wx, ChannelEnum.toutiao);
         for (ChannelEnum channel : channelList) {
@@ -2507,6 +2496,22 @@ public class DataDashboardService {
             }
             result.add(item);
         }
+        // sum
+        ContentFunnelExport sum = buildContentFunnelExport(dateStr);
+        ContentGroupFunnelExport groupSum = new ContentGroupFunnelExport();
+        BeanUtils.copyProperties(sum, groupSum);
+        groupSum.setType("SUM");
+        groupSum.setSource("SUM");
+        if (sum.getCrawlerCount() > 0) {
+            groupSum.setProduceRate(sum.getProduceCount() * 1.0 / sum.getCrawlerCount());
+        }
+        groupSum.setCrawlerCount(sum.getCrawlerCount() + sum.getVideoPoolCrawlerCount());
+        groupSum.setVideoAuditCount(sum.getVideoAuditCount() + sum.getVideoPoolAuditCount());
+        groupSum.setVideoAuditPassCount(sum.getVideoAuditPassCount() + sum.getVideoPoolAuditPassCount());
+        if (groupSum.getVideoAuditCount() > 0) {
+            groupSum.setVideoAuditPassRate(groupSum.getVideoAuditPassCount() * 1.0 / groupSum.getVideoAuditCount());
+        }
+        result.add(groupSum);
         return result;
     }