Merge branch 'device' of wangfan/adweb3-server into master

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

@@ -12,5 +12,6 @@ import java.util.List;
  * @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/IGoogleGTMService.java

@@ -5,11 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.adweb.dmp.entity.GoogleGTM;
 
 /**
- * @Description: dmp_google_gtm
- * @Author: jeecg-boot
- * @Date:   2024-10-10
- * @Version: V1.0
+ * @Description: dmp_google_gtm @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
  */
-public interface IGoogleGTMService extends IService<GoogleGTM> {
-
-}
+public interface IGoogleGTMService extends IService<GoogleGTM> {}

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

@@ -8,12 +8,8 @@ import org.jeecg.modules.adweb.dmp.service.IGoogleGTMService;
 import org.springframework.stereotype.Service;
 
 /**
- * @Description: dmp_google_gtm
- * @Author: jeecg-boot
- * @Date:   2024-10-10
- * @Version: V1.0
+ * @Description: dmp_google_gtm @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
  */
 @Service
-public class GoogleGTMServiceImpl extends ServiceImpl<GoogleGTMMapper, GoogleGTM> implements IGoogleGTMService {
-
-}
+public class GoogleGTMServiceImpl extends ServiceImpl<GoogleGTMMapper, GoogleGTM>
+        implements IGoogleGTMService {}

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

@@ -2,10 +2,15 @@ package org.jeecg.modules.adweb.dmp.vo.report;
 
 import lombok.Data;
 
+/**
+ * 网站分时段统计数据VO, GA流量，询盘数据等
+ *
+ * @author wfansh
+ */
 @Data
 public class PeriodicStatsVO {
 
-    private String period;
+    private String period; // today, yesterday, thisWeek, lastWeek, thisMonth, lastMonth, allTime
 
     private int totalUsers;