Merge branch 'master' into cpq-dev

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

@@ -1,15 +1,16 @@
 package org.jeecg.modules.adweb.common.util;
 
-import com.google.common.collect.ImmutableMap;
-
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.IntStream;
 
 /**
  * AdWeb时间工具类
@@ -46,7 +47,7 @@ public class DateUtil {
      *
      * @param dateType 日期类型
      */
-    public static Map<String, Date> getDateRangeByType(String dateType) {
+    public static Pair<Date, Date> getDateRangeByType(String dateType) {
         Date now = new Date();
         Date start = null;
         Date end = null;
@@ -70,7 +71,7 @@ public class DateUtil {
                 break;
         }
 
-        return ImmutableMap.of("start", start, "end", end);
+        return Pair.of(start, end);
     }
 
     /**
@@ -130,8 +131,15 @@ public class DateUtil {
     public static int diffDays(Date start, Date end) {
         return (int)
                 ChronoUnit.DAYS.between(
-                        LocalDate.ofInstant(end.toInstant(), DEFAULT_ZONE_ID),
-                        LocalDate.ofInstant(start.toInstant(), DEFAULT_ZONE_ID));
+                        LocalDate.ofInstant(start.toInstant(), DEFAULT_ZONE_ID),
+                        LocalDate.ofInstant(end.toInstant(), DEFAULT_ZONE_ID));
+    }
+
+    /** 获取start和end之间所有的日期，包含起止两端 */
+    public static List<Date> getAllDaysBetween(Date start, Date end) {
+        return IntStream.rangeClosed(0, diffDays(start, end))
+                .mapToObj(diff -> addDays(start, diff))
+                .toList();
     }
 
     /**

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

@@ -31,4 +31,9 @@ public class NumberUtil {
 
         return PERCENTAGE_FORMAT.format(number);
     }
+
+    /** 安全除法，当分母为0返回0d，不抛出{@link ArithmeticException} */
+    public static double safeDivide(double x, int y) {
+        return y == 0 ? 0d : x / y;
+    }
 }

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

@@ -0,0 +1,124 @@
+package org.jeecg.modules.adweb.dmp.controller;
+
+import static org.jeecg.modules.adweb.dmp.vo.report.SiteOverviewStatsVO.DailyStatsVO;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.adweb.common.util.DateUtil;
+import org.jeecg.modules.adweb.dmp.service.IGACountryReportService;
+import org.jeecg.modules.adweb.dmp.service.IGADailyReportService;
+import org.jeecg.modules.adweb.dmp.service.IGAPagePathReportService;
+import org.jeecg.modules.adweb.dmp.service.IGASourceMediumReportService;
+import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
+import org.jeecg.modules.adweb.dmp.vo.report.PagePathStatsVO;
+import org.jeecg.modules.adweb.dmp.vo.report.SiteOverviewStatsVO;
+import org.jeecg.modules.adweb.dmp.vo.report.SourceMediumStatsVO;
+import org.jeecg.modules.adweb.enquiry.service.IAdwebEnquiryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 数据分析 - GA网站流量，询盘数据等
+ *
+ * @author wfansh
+ */
+@Tag(name = "DMP数据分析 - 网站流量，询盘数据等")
+@RestController
+@RequestMapping("/dmp-data")
+@Slf4j
+public class DMPDataController {
+
+    @Autowired private IGADailyReportService gaDailyReportService;
+    @Autowired private IGASourceMediumReportService gaSourceMediumReportService;
+    @Autowired private IGACountryReportService gaCountryReportService;
+    @Autowired private IGAPagePathReportService gaPagePathReportService;
+
+    @Autowired private IAdwebEnquiryService adwebEnquiryService;
+
+    /** 网站流量整体分析统计 */
+    @GetMapping("/site-overview/stats")
+    public Result<SiteOverviewStatsVO> getSiteOverviewStats(
+            String siteCode,
+            String dateType,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date start,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date end) {
+        // 1. 计算时间区间
+        if (StringUtils.isNotBlank(dateType)) {
+            Pair<Date, Date> dateRange = DateUtil.getDateRangeByType(dateType);
+            start = dateRange.getLeft();
+            end = dateRange.getRight();
+        }
+
+        // 2. 查询GA Daily Report和Enquiries
+        List<DailyStatsVO> dailyStatsVOs =
+                gaDailyReportService.getDailyStatsWithinPeriod(siteCode, start, end);
+
+        // 3. 生成SiteOverviewStatsVO并返回
+        return Result.ok(SiteOverviewStatsVO.fromDailyStats(dailyStatsVOs));
+    }
+
+    @GetMapping("/source-medium/stats")
+    public Result<List<SourceMediumStatsVO>> getSourceMediumStats(
+            String siteCode,
+            String dateType,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date start,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date end) {
+        // 1. 计算时间区间
+        if (StringUtils.isNotBlank(dateType)) {
+            Pair<Date, Date> dateRange = DateUtil.getDateRangeByType(dateType);
+            start = dateRange.getLeft();
+            end = dateRange.getRight();
+        }
+
+        // 2. 查询并返回
+        return Result.ok(gaSourceMediumReportService.getSourceMediumStats(siteCode, start, end));
+    }
+
+    @GetMapping("/country/stats")
+    public Result<List<CountryStatsVO>> getCountryStats(
+            String siteCode,
+            String dateType,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date start,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date end) {
+        // 1. 计算时间区间
+        if (StringUtils.isNotBlank(dateType)) {
+            Pair<Date, Date> dateRange = DateUtil.getDateRangeByType(dateType);
+            start = dateRange.getLeft();
+            end = dateRange.getRight();
+        }
+
+        // 2. 查询并返回
+        return Result.ok(gaCountryReportService.getCountryStats(siteCode, start, end));
+    }
+
+    @GetMapping("/page-path/stats")
+    public Result<List<PagePathStatsVO>> getPagePathStats(
+            String siteCode,
+            String dateType,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date start,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date end,
+            int limit) {
+        // 1. 计算时间区间
+        if (StringUtils.isNotBlank(dateType)) {
+            Pair<Date, Date> dateRange = DateUtil.getDateRangeByType(dateType);
+            start = dateRange.getLeft();
+            end = dateRange.getRight();
+        }
+
+        // 2. 查询并返回
+        return Result.ok(
+                gaPagePathReportService.getPagePathStats(
+                        siteCode, start, end, limit >= 0 ? limit : 10));
+    }
+}

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

@@ -1,75 +0,0 @@
-package org.jeecg.modules.adweb.dmp.controller;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.adweb.common.util.DateUtil;
-import org.jeecg.modules.adweb.dmp.service.IGAPagePathReportService;
-import org.jeecg.modules.adweb.dmp.vo.report.PagePathStatsVO;
-import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * GA网站流量
- *
- * @author wfansh
- */
-@Tag(name = "Google Analytics网站流量")
-@RestController
-@RequestMapping("/ga-data")
-@Slf4j
-public class GADataController {
-
-    @Autowired private IAdwebSiteService adwebSiteService;
-
-    @Autowired private IGAPagePathReportService gaPagePathReportService;
-
-    //    /** 网站流量分析统计 */
-    //    public Result<?> getSiteTraffic(
-    //            String siteCode,
-    //            String dateType,
-    //            @DateTimeFormat(pattern = "yyyy-MM-dd") Date start,
-    //            @DateTimeFormat(pattern = "yyyy-MM-dd") Date end) {
-    //        // 1. 计算时间区间
-    //        if (StringUtils.isNotBlank(dateType)) {
-    //            Map<String, Date> map = DateUtil.getDateRangeByType(dateType);
-    //            start = map.get("start");
-    //            end = map.get("end");
-    //        } else {
-    //            if (end != null) {
-    //                end = DateUtil.addDays(end, 1);
-    //            }
-    //        }
-    //    }
-
-    @GetMapping("/page-path/stats")
-    public Result<List<PagePathStatsVO>> getPagePathStats(
-            String siteCode,
-            String dateType,
-            @DateTimeFormat(pattern = "yyyy-MM-dd") Date start,
-            @DateTimeFormat(pattern = "yyyy-MM-dd") Date end,
-            int limit) {
-        // 1. 计算时间区间
-        if (StringUtils.isNotBlank(dateType)) {
-            Map<String, Date> dateRange = DateUtil.getDateRangeByType(dateType);
-            start = dateRange.get("start");
-            end = dateRange.get("end");
-        }
-
-        // 2. 查询并返回
-        return Result.ok(
-                gaPagePathReportService.getPagePathStats(
-                        siteCode, start, end, limit >= 0 ? limit : 10));
-    }
-}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/report/data/DateViewData.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -23,7 +22,7 @@ public class DateViewData implements GAReportDataDTO {
 
     private int pageViews;
 
-    private BigDecimal bounceRate;
+    private double bounceRate;
 
-    private BigDecimal avgSessionDuration;
+    private double avgSessionDuration;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/report/data/PagePathViewData.java

@@ -2,8 +2,6 @@ package org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @author wfansh
  */
@@ -12,9 +10,9 @@ public class PagePathViewData implements GAReportDataDTO {
 
     private String pagePath;
 
-    private BigDecimal engagementRate;
+    private double engagementRate;
 
     private int pageViews;
 
-    private BigDecimal avgTimeOnPage;
+    private double avgTimeOnPage;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/report/data/SourceMediaViewData.java

@@ -2,8 +2,6 @@ package org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @author wfansh
  */
@@ -18,9 +16,9 @@ public class SourceMediaViewData implements GAReportDataDTO {
 
     private int sessions;
 
-    private BigDecimal bounceRate;
+    private double bounceRate;
 
-    private BigDecimal avgSessionDuration;
+    private double avgSessionDuration;
 
-    private BigDecimal pageViewsPerSession;
+    private double pageViewsPerSession;
 }

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/GACountryReportMapper.java

@@ -1,16 +1,17 @@
 package org.jeecg.modules.adweb.dmp.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
+import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * @Description: dmp_ga_country_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface GACountryReportMapper extends BaseMapper<GACountryReport> {
 
+    List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end);
 }

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/GASourceMediumReportMapper.java

@@ -1,16 +1,17 @@
 package org.jeecg.modules.adweb.dmp.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.jeecg.modules.adweb.dmp.entity.GASourceMediumReport;
+import org.jeecg.modules.adweb.dmp.vo.report.SourceMediumStatsVO;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * @Description: dmp_ga_source_medium_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_source_medium_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface GASourceMediumReportMapper extends BaseMapper<GASourceMediumReport> {
 
+    List<SourceMediumStatsVO> getSourceMediumStats(String siteCode, Date start, Date end);
 }

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

@@ -2,4 +2,32 @@
 <!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.GACountryReportMapper">
 
+    <select id="getCountryStats" resultType="org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO">
+        SELECT
+        t1.*,
+        LOWER(t2.country_iso_code) country_code,
+        t2.country_name
+        FROM
+        (
+        SELECT
+        country,
+        SUM(total_users) `total_users`
+        FROM
+        dmp_ga_country_report
+        WHERE
+        site_code = #{siteCode}
+        <if test="start != null">
+            AND date >= #{start}
+        </if>
+        <if test="end != null">
+            AND date &lt;= #{end}
+        </if>
+        GROUP BY
+        country
+        ) t1
+        LEFT JOIN adweb_country t2 ON t1.country = t2.country_name_en
+        ORDER BY
+        t1.total_users DESC
+    </select>
+
 </mapper>

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/mapper/xml/GAPagePathReportMapper.xml

@@ -18,7 +18,7 @@
             AND date >= #{start}
         </if>
         <if test="end != null">
-            AND date &lt; DATE_ADD(#{end}, INTERVAL 1 DAY)
+            AND date &lt;= #{end}
         </if>
         GROUP BY page_path
         ) t

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

@@ -2,4 +2,31 @@
 <!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.GASourceMediumReportMapper">
 
+    <select id="getSourceMediumStats" resultType="org.jeecg.modules.adweb.dmp.vo.report.SourceMediumStatsVO">
+        SELECT
+        type,
+        SUM(total_users) total_users,
+        SUM(new_users) new_users,
+        SUM(sessions) sessions,
+        ROUND(SUM(page_views_per_session * sessions)) page_views,
+        ROUND(SUM(avg_session_duration * sessions) / SUM(sessions), 2) avg_session_duration,
+        ROUND(SUM(page_views_per_session * sessions) / SUM(sessions), 2) page_views_per_session
+        FROM
+        dmp_ga_source_medium_report
+        WHERE
+        site_code = #{siteCode}
+        AND (type not like '%adwebcloud%' and type not like '%advich%') AND type != ''
+        <if test="start != null">
+            AND date >= #{start}
+        </if>
+        <if test="end != null">
+            AND date &lt;= #{end}
+        </if>
+        GROUP BY
+        type
+        ORDER BY
+        total_users DESC,
+        avg_session_duration DESC
+    </select>
+
 </mapper>

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

@@ -1,14 +1,16 @@
 package org.jeecg.modules.adweb.dmp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
+import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * @Description: dmp_ga_country_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface IGACountryReportService extends IService<GACountryReport> {
-
+    List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end);
 }

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

@@ -0,0 +1,25 @@
+package org.jeecg.modules.adweb.dmp.service;
+
+import static org.jeecg.modules.adweb.dmp.vo.report.SiteOverviewStatsVO.DailyStatsVO;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import org.jeecg.modules.adweb.dmp.entity.GADailyReport;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: dmp_ga_daily_report @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
+ */
+public interface IGADailyReportService extends IService<GADailyReport> {
+
+    /**
+     * 查询指定时间区间内的{@DailyStatsVO}
+     *
+     * <p>如数据库中某天数据缺失，需填充空数据
+     *
+     * <p>填充每日询盘数据
+     */
+    List<DailyStatsVO> getDailyStatsWithinPeriod(String siteCode, Date start, Date end);
+}

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

@@ -3,13 +3,15 @@ package org.jeecg.modules.adweb.dmp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import org.jeecg.modules.adweb.dmp.entity.GASourceMediumReport;
+import org.jeecg.modules.adweb.dmp.vo.report.SourceMediumStatsVO;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * @Description: dmp_ga_source_medium_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_source_medium_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface IGASourceMediumReportService extends IService<GASourceMediumReport> {
 
+    List<SourceMediumStatsVO> getSourceMediumStats(String siteCode, Date start, Date end);
 }

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/GACountryReportServiceImpl.java

@@ -2,18 +2,47 @@ package org.jeecg.modules.adweb.dmp.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.jeecg.modules.adweb.common.util.NumberUtil;
 import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
 import org.jeecg.modules.adweb.dmp.mapper.GACountryReportMapper;
 import org.jeecg.modules.adweb.dmp.service.IGACountryReportService;
+import org.jeecg.modules.adweb.dmp.vo.report.CountryStatsVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
 /**
- * @Description: dmp_ga_country_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 @Service
-public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMapper, GACountryReport> implements IGACountryReportService {
+public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMapper, GACountryReport>
+        implements IGACountryReportService {
+
+    @Autowired private GACountryReportMapper gaCountryReportMapper;
+
+    @Override
+    public List<CountryStatsVO> getCountryStats(String siteCode, Date start, Date end) {
+        List<CountryStatsVO> countryStatsVOs =
+                gaCountryReportMapper.getCountryStats(siteCode, start, end);
+        if (CollectionUtils.isEmpty(countryStatsVOs)) {
+            return Collections.EMPTY_LIST;
+        }
+
+        // 1. 时间区间内所有国家totalUsers总数
+        int totalUsersSum = countryStatsVOs.stream().mapToInt(CountryStatsVO::getTotalUsers).sum();
+
+        // 2. VO数据填充
+        for (CountryStatsVO countryStatsVO : countryStatsVOs) {
+            countryStatsVO.setTotalUsersProportion(
+                    NumberUtil.formatPercentage(
+                            NumberUtil.safeDivide(countryStatsVO.getTotalUsers(), totalUsersSum),
+                            2));
+        }
 
+        return countryStatsVOs;
+    }
 }

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

@@ -0,0 +1,107 @@
+package org.jeecg.modules.adweb.dmp.service.impl;
+
+import static org.jeecg.modules.adweb.dmp.vo.report.SiteOverviewStatsVO.DailyStatsVO;
+
+import cn.hutool.core.lang.Pair;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.adweb.common.util.DateUtil;
+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.jeecg.modules.adweb.enquiry.mapper.AdwebEnquiryMapper;
+import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @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 {
+
+    @Autowired private IAdwebSiteService adwebSiteService;
+
+    @Autowired private AdwebEnquiryMapper adwebEnquiryMapper;
+
+    /**
+     * 查询指定时间区间内的{@DailyStatsVO}
+     *
+     * <p>如数据库中某天数据缺失，需填充空数据
+     *
+     * <p>填充每日询盘数据
+     */
+    public List<DailyStatsVO> getDailyStatsWithinPeriod(String siteCode, Date start, Date end) {
+        Map<String, DailyStatsVO> dailyStatsVOs = Maps.newHashMap();
+
+        // 0. 起止时间为空时，设置默认区间 - start = 网站发布日期 & end = 今天
+        if (start == null || end == null) {
+            start =
+                    DateUtil.getTodayZeroTime(
+                            adwebSiteService.getSiteByCode(siteCode).getIssueTime());
+            end = DateUtil.getTodayZeroTime(new Date());
+        }
+
+        // 1. VO数据填充
+        List<GADailyReport> gaDailyReports =
+                this.list(
+                        new LambdaQueryWrapper<GADailyReport>()
+                                .eq(GADailyReport::getSiteCode, siteCode)
+                                .ge(GADailyReport::getDate, start)
+                                .le(GADailyReport::getDate, end)
+                                .orderByAsc(GADailyReport::getDate));
+
+        for (GADailyReport gaDailyReport : gaDailyReports) {
+            DailyStatsVO dailyStatsVO = new DailyStatsVO();
+            String date = DateUtils.date2Str(gaDailyReport.getDate(), DateUtils.date_sdf.get());
+            dailyStatsVO.setDate(date);
+            dailyStatsVO.setTotalUsers(gaDailyReport.getTotalUsers());
+            dailyStatsVO.setSessions(gaDailyReport.getSessions());
+            dailyStatsVO.setBounceRate(gaDailyReport.getBounceRate());
+            dailyStatsVO.setAvgSessionDuration(gaDailyReport.getAvgSessionDuration());
+            dailyStatsVO.setPageViews(gaDailyReport.getPageViews());
+            dailyStatsVO.setPageViewsPerSession(gaDailyReport.getPageViewsPerSession());
+            // TODO: 待后续步骤设置
+            //  dailyStatsVO.setEnquires(0);
+
+            dailyStatsVOs.put(date, dailyStatsVO);
+        }
+
+        // 2. 缺失日期补充
+        Set<String> absentDays =
+                Sets.difference(
+                        DateUtil.getAllDaysBetween(start, end).stream()
+                                .map(date -> DateUtils.date2Str(date, DateUtils.date_sdf.get()))
+                                .collect(Collectors.toSet()),
+                        dailyStatsVOs.keySet());
+        absentDays.forEach(
+                date -> {
+                    DailyStatsVO dailyStatsVO = new DailyStatsVO();
+                    dailyStatsVO.setDate(date); // 其它数值字段设置为默认值
+                    dailyStatsVOs.put(date, dailyStatsVO);
+                });
+
+        // 3. 询盘数据补充
+        List<Pair<String, Integer>> enquiryDailyCounts =
+                adwebEnquiryMapper.getEnquiryDailyCounts(siteCode, start, end);
+        enquiryDailyCounts.forEach(
+                enquiryDailyCount ->
+                        dailyStatsVOs
+                                .get(enquiryDailyCount.getKey())
+                                .setEnquires(enquiryDailyCount.getValue()));
+
+        // 3. 根据日期排序并返回
+        return dailyStatsVOs.values().stream()
+                .sorted(Comparator.comparing(DailyStatsVO::getDate)) // 排日期升序排序
+                .toList();
+    }
+}

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

@@ -54,8 +54,7 @@ public class GAPagePathReportServiceImpl
             pagePathStatsVO.setPagePath(siteUrl + pagePathStatsVO.getPagePath());
             pagePathStatsVO.setPvProportion(
                     NumberUtil.formatPercentage(
-                            totalPVs == 0 ? 0 : (double) pagePathStatsVO.getPageViews() / totalPVs,
-                            2));
+                            NumberUtil.safeDivide(pagePathStatsVO.getPageViews(), totalPVs), 2));
         }
 
         return pagePathStatsVOs;

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

@@ -1,20 +1,54 @@
 package org.jeecg.modules.adweb.dmp.service.impl;
 
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.jeecg.modules.adweb.common.util.NumberUtil;
 import org.jeecg.modules.adweb.dmp.entity.GASourceMediumReport;
 import org.jeecg.modules.adweb.dmp.mapper.GASourceMediumReportMapper;
 import org.jeecg.modules.adweb.dmp.service.IGASourceMediumReportService;
+import org.jeecg.modules.adweb.dmp.vo.report.SourceMediumStatsVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
 /**
- * @Description: dmp_ga_source_medium_report
- * @Author: jeecg-boot
- * @Date:   2024-10-11
- * @Version: V1.0
+ * @Description: dmp_ga_source_medium_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 @Service
-public class GASourceMediumReportServiceImpl extends ServiceImpl<GASourceMediumReportMapper, GASourceMediumReport> implements IGASourceMediumReportService {
+public class GASourceMediumReportServiceImpl
+        extends ServiceImpl<GASourceMediumReportMapper, GASourceMediumReport>
+        implements IGASourceMediumReportService {
+    @Autowired private GASourceMediumReportMapper gaSourceMediumReportMapper;
+
+    @Override
+    public List<SourceMediumStatsVO> getSourceMediumStats(String siteCode, Date start, Date end) {
+        List<SourceMediumStatsVO> sourceMediumStatsVOs =
+                gaSourceMediumReportMapper.getSourceMediumStats(siteCode, start, end);
+        if (CollectionUtils.isEmpty(sourceMediumStatsVOs)) {
+            return Collections.EMPTY_LIST;
+        }
+
+        // 1. 时间区间内所有国家totalUsers总数
+        int totalUsersSum =
+                sourceMediumStatsVOs.stream().mapToInt(SourceMediumStatsVO::getTotalUsers).sum();
+
+        // 2. VO数据填充
+        for (SourceMediumStatsVO sourceMediumStatsVO : sourceMediumStatsVOs) {
+            int totalUsers = sourceMediumStatsVO.getTotalUsers();
+            sourceMediumStatsVO.setTotalUsersProportion(
+                    NumberUtil.formatPercentage(
+                            NumberUtil.safeDivide(totalUsers, totalUsersSum), 2));
+
+            sourceMediumStatsVO.setNewUsersRatio(
+                    NumberUtil.formatPercentage(
+                            NumberUtil.safeDivide(sourceMediumStatsVO.getNewUsers(), totalUsers),
+                            2));
+        }
 
+        return sourceMediumStatsVOs;
+    }
 }

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

@@ -0,0 +1,25 @@
+package org.jeecg.modules.adweb.dmp.vo.report;
+
+import lombok.Data;
+
+import org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data.CountryChartData;
+import org.jeecg.modules.adweb.dmp.entity.GACountryReport;
+
+/**
+ * GA国家分布统计数据VO，see {@link CountryChartData} and {@link GACountryReport}
+ *
+ * @author wfansh
+ */
+@Data
+public class CountryStatsVO {
+
+    private String country;
+
+    private String countryName;
+
+    private String countryCode;
+
+    private int totalUsers;
+
+    private String totalUsersProportion;
+}

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

@@ -0,0 +1,123 @@
+package org.jeecg.modules.adweb.dmp.vo.report;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.Data;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.jeecg.modules.adweb.common.util.NumberUtil;
+
+import java.util.List;
+
+/**
+ * 网站综合统计数据VO, GA流量，询盘数据等
+ *
+ * @author wfansh
+ */
+@Data
+public class SiteOverviewStatsVO {
+
+    // 加和数据
+    private int totalUsers; // 总访客数 UV
+
+    private int sessions; // 总会话数
+
+    private int pageViews; // 总浏览量 PV
+
+    private int enquires; // 总询盘数
+
+    // 计算数据
+    private double dailyTotalUsers; // 日均访问量
+
+    private double avgTimeOnPage; // 平均访问时长
+
+    private double pageViewsPerSession; // 平均访问页面数
+
+    private String bounceRate; // 跳出率
+
+    private String enquiryConversionRate; // UV到询盘转化率
+
+    private List<DailyStatsVO> dailyStats;
+
+    @Data
+    public static class DailyStatsVO {
+
+        private String date;
+
+        private int totalUsers;
+
+        @JsonIgnore private int sessions;
+
+        @JsonIgnore private double bounceRate;
+
+        @JsonIgnore private double avgSessionDuration;
+
+        @JsonIgnore private int pageViews;
+
+        @JsonIgnore private double pageViewsPerSession;
+
+        private int enquires;
+    }
+
+    public static SiteOverviewStatsVO fromDailyStats(List<DailyStatsVO> dailyStatsVOs) {
+        if (CollectionUtils.isEmpty(dailyStatsVOs)) {
+            return null;
+        }
+
+        SiteOverviewStatsVO siteOverviewStatsVO = new SiteOverviewStatsVO();
+        // 1. 加和数据
+        int totalUsers = dailyStatsVOs.stream().mapToInt(DailyStatsVO::getTotalUsers).sum();
+        int sessions = dailyStatsVOs.stream().mapToInt(DailyStatsVO::getSessions).sum();
+        int pageViews = dailyStatsVOs.stream().mapToInt(DailyStatsVO::getPageViews).sum();
+        int enquires = dailyStatsVOs.stream().mapToInt(DailyStatsVO::getEnquires).sum();
+
+        siteOverviewStatsVO.setTotalUsers(totalUsers);
+        siteOverviewStatsVO.setSessions(sessions);
+        siteOverviewStatsVO.setPageViews(pageViews);
+        siteOverviewStatsVO.setEnquires(enquires);
+
+        // 2. 计算数据
+        int numDays = dailyStatsVOs.size();
+
+        // 2.1 日均访问量
+        siteOverviewStatsVO.setDailyTotalUsers(
+                NumberUtil.formatDecimal((double) totalUsers / numDays, 2).doubleValue());
+
+        // 2.2 平均访问时长
+        // -- SUM (avgSessionDuration * sessions)
+        double sessionDurationSum =
+                dailyStatsVOs.stream()
+                        .mapToDouble(
+                                dailyStatsVO ->
+                                        dailyStatsVO.getAvgSessionDuration()
+                                                * dailyStatsVO.getSessions())
+                        .sum();
+        siteOverviewStatsVO.setAvgTimeOnPage(
+                NumberUtil.formatDecimal(NumberUtil.safeDivide(sessionDurationSum, sessions), 2)
+                        .doubleValue());
+
+        // 2.3 平均访问页面数
+        siteOverviewStatsVO.setPageViewsPerSession(
+                NumberUtil.formatDecimal(NumberUtil.safeDivide(pageViews, sessions), 2)
+                        .doubleValue());
+
+        // 2.4 跳出率
+        // -- SUM (bounceRate * * sessions)
+        double bounceSum =
+                dailyStatsVOs.stream()
+                        .mapToDouble(
+                                dailyStatsVO ->
+                                        dailyStatsVO.getBounceRate() * dailyStatsVO.getSessions())
+                        .sum();
+        siteOverviewStatsVO.setBounceRate(
+                NumberUtil.formatPercentage(NumberUtil.safeDivide(bounceSum, sessions), 2));
+
+        // 2.5 UV到询盘转化率
+        siteOverviewStatsVO.setEnquiryConversionRate(
+                NumberUtil.formatPercentage(NumberUtil.safeDivide(enquires, totalUsers), 2));
+
+        siteOverviewStatsVO.setDailyStats(dailyStatsVOs);
+
+        return siteOverviewStatsVO;
+    }
+}

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

@@ -0,0 +1,35 @@
+package org.jeecg.modules.adweb.dmp.vo.report;
+
+import lombok.Data;
+
+import org.jeecg.modules.adweb.dmp.dto.google.analytics.report.data.SourceMediaViewData;
+import org.jeecg.modules.adweb.dmp.entity.GASourceMediumReport;
+
+/**
+ * GA流量来源媒介统计数据VO，see {@link SourceMediaViewData} and {@link GASourceMediumReport}
+ *
+ * @author wfansh
+ */
+@Data
+public class SourceMediumStatsVO {
+
+    private String type;
+
+    private int totalUsers;
+
+    private int newUsers;
+
+    private int sessions;
+
+    private int pageViews;
+
+    private double avgSessionDuration;
+
+    private double pageViewsPerSession;
+
+    // totalUsers / SUM (totalUsers)
+    private String totalUsersProportion;
+
+    // newUsers / totalUsers
+    private String newUsersRatio;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebEnquiryController.java

@@ -5,14 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -26,9 +31,9 @@ import org.jeecg.modules.adweb.common.constant.AdwebConstant;
 import org.jeecg.modules.adweb.common.util.AwsTranslateUtils;
 import org.jeecg.modules.adweb.common.util.DateUtil;
 import org.jeecg.modules.adweb.enquiry.constant.EnquirySendStatus;
-import org.jeecg.modules.adweb.enquiry.dto.param.EnquirySearchDto;
 import org.jeecg.modules.adweb.enquiry.dto.param.EffectiveEnquiryParamDto;
 import org.jeecg.modules.adweb.enquiry.dto.param.EnquiryListSearchDto;
+import org.jeecg.modules.adweb.enquiry.dto.param.EnquirySearchDto;
 import org.jeecg.modules.adweb.enquiry.dto.result.EnquiryListDto;
 import org.jeecg.modules.adweb.enquiry.dto.result.EnquirySpecialFields;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiry;
@@ -157,9 +162,9 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
 		Date start = searchDto.getStart();
 		Date end = searchDto.getEnd();
 		if (StringUtils.isNotBlank(dateType)) {
-			Map<String, Date> map = DateUtil.getDateRangeByType(dateType);
-			start = map.get("start");
-			end = map.get("end");
+			Pair<Date, Date> dateRange = DateUtil.getDateRangeByType(dateType);
+			start = dateRange.getLeft();
+			end = dateRange.getRight();
 		} else {
 			if (end != null) {
 				end = DateUtil.addDays(end, 1);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/AdwebEnquiryMapper.java

@@ -1,14 +1,17 @@
 package org.jeecg.modules.adweb.enquiry.mapper;
 
-import java.util.Date;
-import java.util.List;
+import cn.hutool.core.lang.Pair;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.adweb.enquiry.dto.param.EnquirySearchDto;
 import org.jeecg.modules.adweb.enquiry.dto.result.EnquiryListDto;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiry;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: 询盘信息存储表单
@@ -65,5 +68,13 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
 
     List<EnquiryListDto> getWastedEnquiry(String wasteEnquiryType, String ip, String email, String keyword, String searchText, String type, Integer siteId);
 
-
+    /**
+     * 获取每日询盘数量
+     *
+     * @param siteCode
+     * @param start
+     * @param end
+     * @return
+     */
+    List<Pair<String, Integer>> getEnquiryDailyCounts(String siteCode, Date start, Date end);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/xml/AdwebEnquiryMapper.xml

@@ -303,4 +303,24 @@
         and t1.principal_type != 1
     </update>
 
+
+    <select id="getEnquiryDailyCounts" resultType="cn.hutool.core.lang.Pair">
+        SELECT
+        date_format(record_ctime, '%Y-%m-%d') `date`,
+        count(id) enquires
+        FROM
+        adweb_enquiry
+        WHERE
+        `status` != 0
+        AND user_effective != 0
+        AND site_code = #{siteCode}
+        <if test="start != null">
+            AND record_ctime >= #{start}
+        </if>
+        <if test="end != null">
+            AND record_ctime &lt; DATE_ADD(#{end}, INTERVAL 1 DAY)
+        </if>
+        GROUP BY date
+    </select>
+
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/controller/SeoKeywordsController.java

@@ -23,7 +23,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.config.security.utils.SecureUtil;
 import org.jeecg.modules.adweb.seo.dto.AvesApiSearchKeywordsDTO;
@@ -77,10 +76,20 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
             HttpServletRequest req) {
         if ((seoKeywords.getSiteCode() == null || seoKeywords.getSiteCode().isEmpty())) {
-            return Result.error("请选择站点");
+            return Result.OK();
         }
-        QueryWrapper<SeoKeywords> queryWrapper =
-                QueryGenerator.initQueryWrapper(seoKeywords, req.getParameterMap());
+        QueryWrapper<SeoKeywords> queryWrapper = new QueryWrapper<>();
+        if (StringUtil.isNotEmpty(seoKeywords.getKeywords())) {
+            queryWrapper.like("keywords", "%" + seoKeywords.getKeywords() + "%");
+        }
+//        queryWrapper.eq("related_keyword_id", seoKeywords.getRelatedKeywordId());
+//        queryWrapper.eq("subscription_id", seoKeywords.getSubscriptionId());
+        queryWrapper.eq("site_code", seoKeywords.getSiteCode());
+        if (seoKeywords.getKeywordType() != null) {
+            queryWrapper.eq("keyword_type", seoKeywords.getKeywordType());
+        }
+        queryWrapper.ne("status", 0);
+        queryWrapper.orderByAsc("priority").orderByDesc("optimize_process").orderByDesc("create_time");
         Page<SeoKeywords> page = new Page<SeoKeywords>(pageNo, pageSize);
         IPage<SeoKeywords> pageList = seoKeywordsService.page(page, queryWrapper);
         return Result.OK(pageList);