GA country report

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

@@ -53,6 +53,28 @@ public class GADataController {
     //        }
     //    }
 
+    @GetMapping("/country/stats")
+    public Result<List<PagePathStatsVO>> getCountryStats(
+            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));
+    }
+
+
+
     @GetMapping("/page-path/stats")
     public Result<List<PagePathStatsVO>> getPagePathStats(
             String siteCode,

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/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; DATE_ADD(#{end}, INTERVAL 1 DAY)
+        </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/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/impl/GACountryReportServiceImpl.java

@@ -2,18 +2,49 @@ 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(
+                            totalUsersSum == 0
+                                    ? 0
+                                    : (double) countryStatsVO.getTotalUsers() / totalUsersSum,
+                            2));
+        }
 
+        return countryStatsVOs;
+    }
 }

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;
+}