GA daily report

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

@@ -25,15 +25,15 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * GA网站流量
+ * 数据分析 - GA网站流量，询盘数据等
  *
  * @author wfansh
  */
-@Tag(name = "Google Analytics网站流量")
+@Tag(name = "DMP数据分析 - 网站流量，询盘数据等")
 @RestController
-@RequestMapping("/ga-data")
+@RequestMapping("/dmp-data")
 @Slf4j
-public class GADataController {
+public class DMPDataController {
 
     @Autowired private IAdwebSiteService adwebSiteService;
     @Autowired private IGASourceMediumReportService gaSourceMediumReportService;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/entity/GADailyReport.java

@@ -0,0 +1,82 @@
+package org.jeecg.modules.adweb.dmp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: dmp_ga_daily_report
+ * @Author: jeecg-boot
+ * @Date:   2024-11-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("dmp_ga_daily_report")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="dmp_ga_daily_report")
+public class GADailyReport implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+    @Schema(description = "id")
+    private Long id;
+    /**站点code*/
+    @Excel(name = "站点code", width = 15)
+    @Schema(description = "站点code")
+    private String siteCode;
+	/**统计时间*/
+	@Excel(name = "统计时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Schema(description = "统计时间")
+    private Date date;
+	/**访问量*/
+	@Excel(name = "访问量", width = 15)
+    @Schema(description = "访问量")
+    private Integer totalUsers;
+	/**新用户数量*/
+	@Excel(name = "新用户数量", width = 15)
+    @Schema(description = "新用户数量")
+    private Integer newUsers;
+	/**会话数量*/
+	@Excel(name = "会话数量", width = 15)
+    @Schema(description = "会话数量")
+    private Integer sessions;
+	/**bounceRate*/
+	@Excel(name = "bounceRate", width = 15)
+    @Schema(description = "bounceRate")
+    private Double bounceRate;
+	/**avgSessionDuration*/
+	@Excel(name = "avgSessionDuration", width = 15)
+    @Schema(description = "avgSessionDuration")
+    private Double avgSessionDuration;
+    /**页面访问量*/
+    @Excel(name = "页面访问量", width = 15)
+    @Schema(description = "页面访问量")
+    private Integer pageViews;
+    /**pageViewsPerSession*/
+	@Excel(name = "pageViewsPerSession", width = 15)
+    @Schema(description = "pageViewsPerSession")
+    private Double pageViewsPerSession;
+	/**ctime*/
+	@Excel(name = "ctime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "ctime")
+    private Date ctime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/mapper/GADailyReportMapper.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.adweb.dmp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import org.jeecg.modules.adweb.dmp.entity.GADailyReport;
+
+/**
+ * @Description: dmp_ga_daily_report
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface GADailyReportMapper extends BaseMapper<GADailyReport> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/mapper/xml/GADailyReportMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.adweb.dmp.mapper.GA">
+
+</mapper>

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.adweb.dmp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import org.jeecg.modules.adweb.dmp.entity.GADailyReport;
+
+/**
+ * @Description: dmp_ga_daily_report
+ * @Author: jeecg-boot
+ * @Date:   2024-10-10
+ * @Version: V1.0
+ */
+public interface IGADailyReportService extends IService<GADailyReport> {
+
+}

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

@@ -28,14 +28,8 @@ import org.jeecg.modules.adweb.dmp.dto.google.analytics.report.ReportConstant;
 import org.jeecg.modules.adweb.dmp.dto.google.analytics.report.ReportType;
 import org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data.CustomReportData;
 import org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data.GAReportDataDTO;
-import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
-import org.jeecg.modules.adweb.dmp.entity.GAPagePathReport;
-import org.jeecg.modules.adweb.dmp.entity.GASourceMediumReport;
-import org.jeecg.modules.adweb.dmp.entity.GoogleGTM;
-import org.jeecg.modules.adweb.dmp.service.IGACountryReportService;
-import org.jeecg.modules.adweb.dmp.service.IGAPagePathReportService;
-import org.jeecg.modules.adweb.dmp.service.IGASourceMediumReportService;
-import org.jeecg.modules.adweb.dmp.service.IGoogleGTMService;
+import org.jeecg.modules.adweb.dmp.entity.*;
+import org.jeecg.modules.adweb.dmp.service.*;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -58,6 +52,8 @@ import java.util.Objects;
 public class GAReportService {
 
     // GA report entities对应的数据表名称
+    private static final String TABLE_GA_DAILY_REPORT =
+            AnnotationUtils.findAnnotation(GADailyReport.class, TableName.class).value();
     private static final String TABLE_GA_COUNTRY_REPORT =
             AnnotationUtils.findAnnotation(GACountryReport.class, TableName.class).value();
     private static final String TABLE_GA_SOURCE_MEDIUM_REPORT =
@@ -75,6 +71,7 @@ public class GAReportService {
 
     @Autowired private IAdwebSiteService adwebSiteService;
     @Autowired private IGoogleGTMService googleGTMService;
+    @Autowired private IGADailyReportService gaDailyReportService;
     @Autowired private IGACountryReportService gaCountryReportService;
     @Autowired private IGASourceMediumReportService gaSourceMediumReportService;
     @Autowired private IGAPagePathReportService gaPagePathReportService;
@@ -103,8 +100,9 @@ public class GAReportService {
                         new LambdaQueryWrapper<GoogleGTM>().in(GoogleGTM::getSiteCode, siteCodes));
 
         for (GoogleGTM googleGTM : googleGTMs) {
-            // 每个帐号同步更新三张报表
+            // 每个帐号同步更新四张报表
             try {
+                this.syncGADailyReport(googleGTM);
                 this.syncGACountryReport(googleGTM);
                 this.syncGASourceMediumReport(googleGTM);
                 this.syncGAPagePathReport(googleGTM);
@@ -115,6 +113,73 @@ public class GAReportService {
     }
 
     /**
+     * 拉取并同步Google Analytics - Daily报表
+     *
+     * @param googleGTM
+     */
+    private void syncGADailyReport(GoogleGTM googleGTM) {
+        // 1. 报表时间区间
+        Date startDate = this.getReportStartDate(TABLE_GA_DAILY_REPORT, googleGTM.getSiteCode());
+        Date endDate = new Date();
+
+        // 2. 构建GA报表请求参数
+        // 使用ADWEB_CUSTOM_REPORT，不是ADWEB_DATE_VIEW - 需要更多metrics字段
+        GAReportRequestDTO gaReportRequest = new GAReportRequestDTO();
+        gaReportRequest.setPropertyResourceName(
+                GAPropertyDTO.toResourceName(googleGTM.getGaPropertyId()));
+        gaReportRequest.setReportType(ReportType.ADWEB_CUSTOM_REPORT);
+        gaReportRequest.setStartDate(DateUtils.date2Str(startDate, DateUtils.date_sdf.get()));
+        gaReportRequest.setEndDate(DateUtils.date2Str(endDate, DateUtils.date_sdf.get()));
+        gaReportRequest.setMetrics(
+                List.of(
+                        ReportConstant.METRIC_TOTAL_USERS,
+                        ReportConstant.METRIC_NEW_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));
+        gaReportRequest.setDimensions(List.of(ReportConstant.DIMENSION_DATE));
+        gaReportRequest.setOrderByType(OrderByType.DIMENSIONS);
+        gaReportRequest.setOrderBy(ReportConstant.DIMENSION_DATE);
+        List<CustomReportData> reportDataList =
+                runGAReport(gaReportRequest, CustomReportData.class);
+
+        // 2. 转化为DB entity
+        List<GADailyReport> dailyReport = Lists.newArrayList();
+        for (CustomReportData reportData : reportDataList) {
+            GADailyReport reportRow = new GADailyReport();
+            reportRow.setSiteCode(googleGTM.getSiteCode());
+            reportRow.setDate(
+                    DateUtils.str2Date(
+                            reportData.get(ReportConstant.DIMENSION_DATE),
+                            DateUtils.date_sdf.get()));
+            reportRow.setTotalUsers(
+                    Integer.parseInt(reportData.get(ReportConstant.METRIC_TOTAL_USERS)));
+            reportRow.setNewUsers(
+                    Integer.parseInt(reportData.get(ReportConstant.METRIC_NEW_USERS)));
+            reportRow.setSessions(Integer.parseInt(reportData.get(ReportConstant.METRIC_SESSIONS)));
+            reportRow.setBounceRate(
+                    Double.parseDouble(reportData.get(ReportConstant.METRIC_BOUNCE_RATE)));
+            reportRow.setAvgSessionDuration(
+                    Double.parseDouble(reportData.get(ReportConstant.METRIC_AVG_SESSION_DURATION)));
+            reportRow.setPageViews(Integer.parseInt(reportData.get(METRIC_SCREEN_PAGE_VIEWS)));
+            reportRow.setPageViewsPerSession(
+                    Double.parseDouble(
+                            reportData.get(ReportConstant.METRIC_SCREEN_PAGE_VIEWS_PER_SESSION)));
+
+            dailyReport.add(reportRow);
+        }
+
+        // 3. 更新数据库 - 删除旧数据，插入新数据
+        gaDailyReportService.remove(
+                this.getRemoveQueryWrapper(
+                        GADailyReport.class, googleGTM.getSiteCode(), startDate, endDate));
+
+        gaDailyReportService.saveBatch(dailyReport, dailyReport.size());
+    }
+
+    /**
      * 拉取并同步Google Analytics - Country报表
      *
      * @param googleGTM

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.adweb.dmp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.jeecg.modules.adweb.dmp.entity.GADailyReport;
+import org.jeecg.modules.adweb.dmp.mapper.GADailyReportMapper;
+import org.jeecg.modules.adweb.dmp.service.IGADailyReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: dmp_ga_daily_report
+ * @Author: jeecg-boot
+ * @Date:   2024-11-04
+ * @Version: V1.0
+ */
+@Service
+public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, GADailyReport> implements IGADailyReportService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/vo/report/SiteOverviewStatsVO.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.adweb.dmp.vo.report;
+
+import lombok.Data;
+
+/**
+ * 网站综合统计数据VO, GA流量，询盘数据等
+ *
+ * @author wfansh
+ */
+@Data
+public class SiteOverviewStatsVO {
+
+    private int totalUsers;
+
+    private int pageViews;
+
+    private int enquires;
+
+    // 计算统计数据
+    private double dailyPageViews;
+
+    private int avgTimeOnPage;
+
+    private double pageViewsPerSession;
+
+    private String bounceRate;
+
+    private String enquiryConversionRate;
+
+    @Data
+    public class DailyMetricVO {
+
+        private String date;
+
+        private int totalUsers;
+
+        private int pageViews;
+
+        private int enquires;
+    }
+}