Realtime report

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/DateUtil.java

@@ -58,6 +58,7 @@ public class DateUtil {
     public static final String DATE_TYPE_LAST_WEEK = "lastWeek";
     public static final String DATE_TYPE_THIS_MONTH = "thisMonth";
     public static final String DATE_TYPE_LAST_MONTH = "lastMonth";
+    public static final String DATE_TYPE_ALL_TIME = "allTime";
 
     /** 取得系统当前日期 */
     public static Date getDate() {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/controller/DMPDataController.java

@@ -51,7 +51,10 @@ public class DMPDataController {
     @GetMapping("/site-periodic/stats")
     public Result<Map<String, PeriodicStatsVO>> getSitePeriodicStats(String siteCode) {
         // 1. 查询分时间段的GA Report和Enquiries
-        List<PeriodicStatsVO> periodicStatsVOs = gaDailyReportService.getPeriodicStats(siteCode);
+        List<PeriodicStatsVO> periodicStatsVOs =
+                realtimeReport
+                        ? realtimeReportService.getPeriodicStats(siteCode)
+                        : gaDailyReportService.getPeriodicStats(siteCode);
 
         // 2. 转换为Map并返回
         return Result.ok(

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

@@ -9,9 +9,12 @@ import com.google.common.collect.Sets;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jeecg.modules.adweb.common.enums.CountryCode;
 import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
 import org.jeecg.modules.adweb.common.util.DateUtil;
@@ -35,6 +38,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -59,9 +63,98 @@ public class RealtimeReportService {
      *
      * <p>填充各时间段询盘数据
      */
+    @Cacheable(
+            cacheManager = CacheConfig.TTL_CACHE_MANAGER,
+            cacheNames =
+                    "dmp:realtime:getPeriodicStats"
+                            + TTLCacheManager.TTL_SPLITTER
+                            + 60 * 10) // Redis TTL为10分钟
     public List<PeriodicStatsVO> getPeriodicStats(String siteCode) {
-        // TODO
-        return Collections.EMPTY_LIST;
+        GoogleGTM googleGTM = this.getGTMAccount(siteCode);
+        if (StringUtils.isBlank(googleGTM.getGaPropertyId())) {
+            log.info("Google Analytics帐号未配置, siteCode = {}", siteCode);
+            return Collections.EMPTY_LIST;
+        }
+
+        // 1. 查询GA统计数据 - UV，PV等
+        Map<String, PeriodicStatsVO> periodicStatsVOs =
+                List.of(
+                                DateUtil.DATE_TYPE_TODAY,
+                                DateUtil.DATE_TYPE_YESTERDAY,
+                                DateUtil.DATE_TYPE_THIS_WEEK,
+                                DateUtil.DATE_TYPE_LAST_WEEK,
+                                DateUtil.DATE_TYPE_THIS_MONTH,
+                                DateUtil.DATE_TYPE_LAST_MONTH,
+                                DateUtil.DATE_TYPE_ALL_TIME)
+                        .parallelStream()
+                        .map(period -> this.getPeriodicStats(googleGTM.getGaPropertyId(), period))
+                        .collect(
+                                Collectors.toMap(
+                                        PeriodicStatsVO::getPeriod,
+                                        Function.identity(),
+                                        (x, y) -> y,
+                                        LinkedHashMap::new)); // 使用LinkedHashMap保持原查询顺序
+
+        // 2. 询盘数据补充
+        List<ImmutablePair<String, Long>> enquiryPeriodicCounts =
+                adwebEnquiryMapper.getEnquiryPeriodicCounts(siteCode);
+        for (ImmutablePair<String, Long> enquiryPeriodicCount : enquiryPeriodicCounts) {
+            if (!periodicStatsVOs.containsKey(enquiryPeriodicCount.getKey())) {
+                continue;
+            }
+
+            PeriodicStatsVO periodicStatsVO = periodicStatsVOs.get(enquiryPeriodicCount.getKey());
+            periodicStatsVO.setEnquires(enquiryPeriodicCount.getValue().intValue());
+            periodicStatsVO.setEnquiryConversionRate(
+                    NumberUtil.formatPercentage(
+                            NumberUtil.safeDivide(
+                                    periodicStatsVO.getEnquires(), periodicStatsVO.getTotalUsers()),
+                            2));
+        }
+
+        return periodicStatsVOs.values().stream()
+                .collect(Collectors.toList()); // 使用toList()方法返回UnmodifiableList，导致Redis类型解析异常
+    }
+
+    /**
+     * 拉取Google Analytics - 某时间段报表
+     *
+     * <p>see {@link #getPeriodicStats(String, 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);
+
+        // 3. 转化为VO
+        PeriodicStatsVO periodicStatsVO = new PeriodicStatsVO();
+        periodicStatsVO.setPeriod(period);
+        if (CollectionUtils.isNotEmpty(reportDataList)) {
+            periodicStatsVO.setTotalUsers(
+                    Integer.parseInt(reportDataList.get(0).get(ReportConstant.METRIC_TOTAL_USERS)));
+            periodicStatsVO.setPageViews(
+                    Integer.parseInt(
+                            reportDataList.get(0).get(ReportConstant.METRIC_SCREEN_PAGE_VIEWS)));
+        }
+
+        return periodicStatsVO;
     }
 
     /**