GA daily report

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

@@ -10,6 +10,7 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.IntStream;
 
 /**
  * AdWeb时间工具类
@@ -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/dmp/mapper/xml/GACountryReportMapper.xml

@@ -20,7 +20,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
         country

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

@@ -20,7 +20,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
         type

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

@@ -1,15 +1,23 @@
 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
+ * @Description: dmp_ga_daily_report @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
  */
 public interface IGADailyReportService extends IService<GADailyReport> {
 
+    /**
+     * 查询指定时间区间内的{@DailyStatsVO}
+     *
+     * <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/impl/GADailyReportServiceImpl.java

@@ -1,19 +1,88 @@
 package org.jeecg.modules.adweb.dmp.service.impl;
 
+import static org.jeecg.modules.adweb.dmp.vo.report.SiteOverviewStatsVO.DailyStatsVO;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Sets;
 
+import org.apache.commons.compress.utils.Lists;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
- * @Description: dmp_ga_daily_report
- * @Author: jeecg-boot
- * @Date:   2024-11-04
- * @Version: V1.0
+ * @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 {
+public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, GADailyReport>
+        implements IGADailyReportService {
+
+    @Autowired private GADailyReportMapper gaDailyReportMapper;
+
+    /**
+     * 查询指定时间区间内的{@DailyStatsVO}
+     *
+     * <p>如数据库中某天数据缺失，需填充空数据
+     */
+    public List<DailyStatsVO> getDailyStatsWithinPeriod(String siteCode, Date start, Date end) {
+        List<DailyStatsVO> dailyStatsVOs = Lists.newArrayList();
+
+        List<GADailyReport> gaDailyReports =
+                this.list(
+                        new LambdaQueryWrapper<GADailyReport>()
+                                .eq(GADailyReport::getSiteCode, siteCode)
+                                .ge(GADailyReport::getDate, start)
+                                .le(GADailyReport::getDate, end)
+                                .orderByAsc(GADailyReport::getDate));
+
+        // 1. VO数据填充
+        for (GADailyReport gaDailyReport : gaDailyReports) {
+            DailyStatsVO dailyStatsVO = new DailyStatsVO();
+            dailyStatsVO.setDate(
+                    DateUtils.date2Str(gaDailyReport.getDate(), DateUtils.date_sdf.get()));
+            dailyStatsVO.setTotalUsers(gaDailyReport.getTotalUsers());
+            dailyStatsVO.setPageViews(gaDailyReport.getPageViews());
+            // TODO: 待后续步骤设置
+            dailyStatsVO.setEnquires(0);
+
+            dailyStatsVOs.add(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.stream()
+                                .map(DailyStatsVO::getDate)
+                                .collect(Collectors.toSet()));
+        absentDays.forEach(
+                date -> {
+                    DailyStatsVO dailyStatsVO = new DailyStatsVO();
+                    dailyStatsVO.setDate(date);
+                    // 全部设置为默认值
+                    dailyStatsVO.setTotalUsers(0);
+                    dailyStatsVO.setPageViews(0);
+                    dailyStatsVO.setEnquires(0);
+
+                    dailyStatsVOs.add(dailyStatsVO);
+                });
 
+        // 3. 根据日期排序并返回
+        return dailyStatsVOs.stream()
+                .sorted(Comparator.comparing(DailyStatsVO::getDate)) // 排日期升序排序
+                .toList();
+    }
 }

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

@@ -28,7 +28,7 @@ public class SiteOverviewStatsVO {
     private String enquiryConversionRate;
 
     @Data
-    public class DailyMetricVO {
+    public static class DailyStatsVO {
 
         private String date;