Realtime

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/RealtimeReportService.java

@@ -59,7 +59,8 @@ public class RealtimeReportService {
     @Autowired private AdwebRedisUtil adwebRedisUtil;
 
     /**
-     * 拉取Google Analytics - 时间段报表 - 今天，昨天，本周，上周，本月，上月，全部
+     * 拉取Google Analytics - Period报表（today, yesterday, thisWeek, lastWeek, thisMonth, lastMonth,
+     * allTime）
      *
      * <p>填充各时间段询盘数据
      */
@@ -73,7 +74,6 @@ public class RealtimeReportService {
         GoogleGTM googleGTM = this.getGTMAccount(siteCode);
         if (StringUtils.isBlank(googleGTM.getGaPropertyId())) {
             log.info("Google Analytics帐号未配置, siteCode = {}", siteCode);
-            return Collections.EMPTY_LIST;
         }
 
         // 1. 查询GA统计数据 - UV，PV等
@@ -117,31 +117,33 @@ public class RealtimeReportService {
     }
 
     /**
-     * 拉取Google Analytics - 某时间段报表
+     * 拉取Google Analytics - 指定Period报表
      *
-     * <p>see {@link #getPeriodicStats(String, String)}
+     * <p>see {@link #getPeriodicStats(String)}
      */
     private PeriodicStatsVO getPeriodicStats(String propertyId, String period) {
         // 0. 计算时间区间
         Pair<Date, Date> dateRange = DateUtil.getDateRangeByType(period);
 
-        // 1. 构建GA报表请求参数
-        GAReportRequestDTO gaReportRequest =
-                this.buildGAReportRequest(
-                        propertyId,
-                        dateRange.getLeft(),
-                        dateRange.getRight(),
-                        List.of(
-                                ReportConstant.METRIC_TOTAL_USERS,
-                                ReportConstant.METRIC_SCREEN_PAGE_VIEWS),
-                        List.of(),
-                        OrderByType.METRICS,
-                        ReportConstant.METRIC_TOTAL_USERS,
-                        true);
-
-        // 2. 请求API接口
-        List<CustomReportData> reportDataList =
-                gaReportService.runGAReport(gaReportRequest, CustomReportData.class);
+        List<CustomReportData> reportDataList = Lists.newArrayList();
+        if (StringUtils.isNotBlank(propertyId)) {
+            // 1. 构建GA报表请求参数
+            GAReportRequestDTO gaReportRequest =
+                    this.buildGAReportRequest(
+                            propertyId,
+                            dateRange.getLeft(),
+                            dateRange.getRight(),
+                            List.of(
+                                    ReportConstant.METRIC_TOTAL_USERS,
+                                    ReportConstant.METRIC_SCREEN_PAGE_VIEWS),
+                            List.of(),
+                            OrderByType.METRICS,
+                            ReportConstant.METRIC_TOTAL_USERS,
+                            true);
+
+            // 2. 请求API接口
+            reportDataList = gaReportService.runGAReport(gaReportRequest, CustomReportData.class);
+        }
 
         // 3. 转化为VO
         PeriodicStatsVO periodicStatsVO = new PeriodicStatsVO();
@@ -172,10 +174,6 @@ public class RealtimeReportService {
                             + 60 * 10) // Redis TTL为10分钟
     public List<DailyStatsVO> getDailyStats(String siteCode, Date start, Date end) {
         GoogleGTM googleGTM = this.getGTMAccount(siteCode);
-        if (StringUtils.isBlank(googleGTM.getGaPropertyId())) {
-            log.info("Google Analytics帐号未配置, siteCode = {}", siteCode);
-            return Collections.EMPTY_LIST;
-        }
 
         // 0. 起止日期为空时，设置默认区间 - start = 网站发布日期 & end = 今天
         if (start == null || end == null) {
@@ -187,27 +185,31 @@ public class RealtimeReportService {
             end = DateUtil.getTodayZeroTime(new Date());
         }
 
-        // 1. 构建GA报表请求参数
-        GAReportRequestDTO gaReportRequest =
-                this.buildGAReportRequest(
-                        googleGTM.getGaPropertyId(),
-                        start,
-                        end,
-                        List.of(
-                                ReportConstant.METRIC_TOTAL_USERS,
-                                ReportConstant.METRIC_SESSIONS,
-                                ReportConstant.METRIC_BOUNCE_RATE,
-                                ReportConstant.METRIC_AVG_SESSION_DURATION,
-                                ReportConstant.METRIC_SCREEN_PAGE_VIEWS,
-                                ReportConstant.METRIC_SCREEN_PAGE_VIEWS_PER_SESSION),
-                        List.of(ReportConstant.DIMENSION_DATE),
-                        OrderByType.DIMENSIONS,
-                        ReportConstant.DIMENSION_DATE,
-                        false);
-
-        // 2. 请求API接口
-        List<CustomReportData> reportDataList =
-                gaReportService.runGAReport(gaReportRequest, CustomReportData.class);
+        List<CustomReportData> reportDataList = Lists.newArrayList();
+        if (StringUtils.isBlank(googleGTM.getGaPropertyId())) {
+            log.info("Google Analytics帐号未配置, siteCode = {}", siteCode);
+        } else {
+            // 1. 构建GA报表请求参数
+            GAReportRequestDTO gaReportRequest =
+                    this.buildGAReportRequest(
+                            googleGTM.getGaPropertyId(),
+                            start,
+                            end,
+                            List.of(
+                                    ReportConstant.METRIC_TOTAL_USERS,
+                                    ReportConstant.METRIC_SESSIONS,
+                                    ReportConstant.METRIC_BOUNCE_RATE,
+                                    ReportConstant.METRIC_AVG_SESSION_DURATION,
+                                    ReportConstant.METRIC_SCREEN_PAGE_VIEWS,
+                                    ReportConstant.METRIC_SCREEN_PAGE_VIEWS_PER_SESSION),
+                            List.of(ReportConstant.DIMENSION_DATE),
+                            OrderByType.DIMENSIONS,
+                            ReportConstant.DIMENSION_DATE,
+                            false);
+
+            // 2. 请求API接口
+            reportDataList = gaReportService.runGAReport(gaReportRequest, CustomReportData.class);
+        }
 
         // 3. 转化为VOs
         Map<String, DailyStatsVO> dailyStatsVOs = Maps.newHashMap();
@@ -410,7 +412,12 @@ public class RealtimeReportService {
                             2));
         }
 
-        return sourceMediumStatsVOs;
+        return sourceMediumStatsVOs.stream()
+                .sorted(
+                        Comparator.comparingInt(SourceMediumStatsVO::getTotalUsers)
+                                .thenComparingDouble(SourceMediumStatsVO::getAvgSessionDuration)
+                                .reversed())
+                .collect(Collectors.toList()); // 使用toList()方法返回UnmodifiableList，导致Redis类型解析异常
     }
 
     /** 拉取Google Analytics - Page Path报表 */
@@ -481,6 +488,10 @@ public class RealtimeReportService {
         }
 
         return pagePathStatsVOs.stream()
+                .sorted(
+                        Comparator.comparingInt(PagePathStatsVO::getPageViews)
+                                .thenComparingDouble(PagePathStatsVO::getAvgTimeOnPage)
+                                .reversed())
                 .limit(limit)
                 .collect(Collectors.toList()); // 使用toList()方法返回UnmodifiableList，导致Redis类型解析异常
     }

jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml

@@ -371,7 +371,7 @@ v3:
   projectPath: /opt/adweb3/pem
   dmp:
     # DMP模块实时报表开关，true-从DataBridge实时读取 false-从DB离线读取
-    realtimeReport: false
+    realtimeReport: true
 
 ### GA,GTM,Ads等数据交换中心
 data-bridge: