品类数据导出

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

@@ -3501,7 +3501,7 @@ public class DataDashboardService {
     @XxlJob("dailyAuditProduceExport")
     public ReturnT<String> dailyAuditProduceJob(String param) {
         List<String> dateStrList = DateUtils.getBeforeDays(null, null, 1);
-        contentEffectGroupBySource(dateStrList);
+        dailyAuditProduce(dateStrList);
         return ReturnT.SUCCESS;
     }
 
@@ -3584,7 +3584,7 @@ public class DataDashboardService {
     @XxlJob("categoryGroupDataExport")
     public ReturnT<String> categoryGroupDataJob(String param) {
         List<String> dateStrList = DateUtils.getBeforeDays(null, null, 1);
-        contentEffectGroupBySource(dateStrList);
+        categoryGroupData(dateStrList);
         return ReturnT.SUCCESS;
     }
 
@@ -3663,11 +3663,11 @@ public class DataDashboardService {
                 export.setDateStr(dateStr);
                 export.setPosition(ContentPositionEnum.from(item.getPosition()));
                 export.setCategory(articleCategory.getCategory());
+                positionMap.put(articleCategory.getCategory(), export);
             }
             export.setViewCount(export.getViewCount() + item.getViewCount());
             export.setFirstLevel(export.getFirstLevel() + item.getFirstLevel());
             export.setFansCount(export.getFansCount() + item.getFans());
-            positionMap.put(articleCategory.getCategory(), export);
         }
         List<CategoryGroupDataExport> result = new ArrayList<>();
         for (Map.Entry<String, Map<String, CategoryGroupDataExport>> entry : resultMap.entrySet()) {
@@ -3678,9 +3678,28 @@ public class DataDashboardService {
                 }
                 result.add(export);
             }
+            result.add(buildCategoryGroupDataSum(dateStr, entry.getKey(), entry.getValue()));
         }
         return result;
     }
 
+    private CategoryGroupDataExport buildCategoryGroupDataSum(String dateStr, String position,
+                                                              Map<String, CategoryGroupDataExport> categoryMap) {
+        CategoryGroupDataExport sum = new CategoryGroupDataExport();
+        sum.setDateStr(dateStr);
+        sum.setPosition(position);
+        sum.setCategory("SUM");
+        for (Map.Entry<String, CategoryGroupDataExport> entry : categoryMap.entrySet()) {
+            CategoryGroupDataExport export = entry.getValue();
+            sum.setViewCount(sum.getViewCount() + export.getViewCount());
+            sum.setFirstLevel(sum.getFirstLevel() + export.getFirstLevel());
+            sum.setFansCount(sum.getFansCount() + export.getFansCount());
+        }
+        if (sum.getFansCount() != null && sum.getFansCount() != 0) {
+            sum.setOpenRate((double) sum.getFirstLevel() / sum.getFansCount());
+        }
+        return sum;
+    }
+
 
 }