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

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

@@ -18,16 +18,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: dmp_ga_country_report
+ * @Description: adweb_dmp_ga_country_report
  * @Author: jeecg-boot
  * @Date: 2024-10-11
  * @Version: V1.0
  */
 @Data
-@TableName("dmp_ga_country_report")
+@TableName("adweb_dmp_ga_country_report")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "dmp_ga_country_report")
+@Schema(description = "adweb_dmp_ga_country_report")
 public class GACountryReport implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -18,16 +18,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: dmp_ga_daily_report
+ * @Description: adweb_dmp_ga_daily_report
  * @Author: jeecg-boot
  * @Date: 2024-11-04
  * @Version: V1.0
  */
 @Data
-@TableName("dmp_ga_daily_report")
+@TableName("adweb_dmp_ga_daily_report")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "dmp_ga_daily_report")
+@Schema(description = "adweb_dmp_ga_daily_report")
 public class GADailyReport implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -18,16 +18,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: dmp_ga_device_report
+ * @Description: adweb_dmp_ga_device_report
  * @Author: jeecg-boot
  * @Date: 2024-12-16
  * @Version: V1.0
  */
 @Data
-@TableName("dmp_ga_device_report")
+@TableName("adweb_dmp_ga_device_report")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "dmp_ga_device_report")
+@Schema(description = "adweb_dmp_ga_device_report")
 public class GADeviceReport implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -18,16 +18,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: dmp_ga_page_path_report
+ * @Description: adweb_dmp_ga_page_path_report
  * @Author: jeecg-boot
  * @Date: 2024-10-11
  * @Version: V1.0
  */
 @Data
-@TableName("dmp_ga_page_path_report")
+@TableName("adweb_dmp_ga_page_path_report")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "dmp_ga_page_path_report")
+@Schema(description = "adweb_dmp_ga_page_path_report")
 public class GAPagePathReport implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -18,16 +18,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: dmp_ga_source_medium_report
+ * @Description: adweb_dmp_ga_source_medium_report
  * @Author: jeecg-boot
  * @Date: 2024-10-11
  * @Version: V1.0
  */
 @Data
-@TableName("dmp_ga_source_medium_report")
+@TableName("adweb_dmp_ga_source_medium_report")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "dmp_ga_source_medium_report")
+@Schema(description = "adweb_dmp_ga_source_medium_report")
 public class GASourceMediumReport implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -18,16 +18,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: dmp_google_gtm
+ * @Description: adweb_dmp_google_gtm
  * @Author: jeecg-boot
  * @Date: 2024-10-10
  * @Version: V1.0
  */
 @Data
-@TableName("dmp_google_gtm")
+@TableName("adweb_dmp_google_gtm")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "dmp_google_gtm")
+@Schema(description = "adweb_dmp_google_gtm")
 public class GoogleGTM implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -9,7 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
+ * @Description: adweb_dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface GACountryReportMapper extends BaseMapper<GACountryReport> {
 

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

@@ -8,7 +8,7 @@ import org.jeecg.modules.adweb.dmp.vo.report.PeriodicStatsVO;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_daily_report @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
+ * @Description: adweb_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/GADeviceReportMapper.java

@@ -9,7 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
+ * @Description: adweb_dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
  */
 public interface GADeviceReportMapper extends BaseMapper<GADeviceReport> {
 

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

@@ -9,7 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_page_path_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
+ * @Description: adweb_dmp_ga_page_path_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface GAPagePathReportMapper extends BaseMapper<GAPagePathReport> {
 

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

@@ -9,7 +9,7 @@ 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: adweb_dmp_ga_source_medium_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface GASourceMediumReportMapper extends BaseMapper<GASourceMediumReport> {
 

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.adweb.dmp.entity.GoogleGTM;
 
 /**
- * @Description: dmp_google_gtm
+ * @Description: adweb_dmp_google_gtm
  * @Author: jeecg-boot
  * @Date:   2024-10-10
  * @Version: V1.0

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

@@ -13,7 +13,7 @@
         country,
         SUM(total_users) AS total_users
         FROM
-        dmp_ga_country_report
+        adweb_dmp_ga_country_report
         WHERE
         site_code = #{siteCode}
         <if test="start != null">

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

@@ -18,7 +18,7 @@
         UNION ALL SELECT 'allTime'
         ) tp
         LEFT JOIN
-        dmp_ga_daily_report d
+        adweb_dmp_ga_daily_report d
         ON
         d.site_code = #{siteCode}
         AND (

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

@@ -9,7 +9,7 @@
         SUM(sessions) sessions,
         SUM(page_views) page_views
         FROM
-        dmp_ga_device_report
+        adweb_dmp_ga_device_report
         WHERE
         site_code = #{siteCode}
         <if test="start != null">

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

@@ -11,7 +11,7 @@
         page_path,
         SUM(page_views) page_views,
         ROUND(SUM(page_views * avg_time_on_page) / SUM(page_views), 2) avg_time_on_page
-        FROM dmp_ga_page_path_report
+        FROM adweb_dmp_ga_page_path_report
         WHERE
         site_code = #{siteCode}
         <if test="start != null">
@@ -32,7 +32,7 @@
         SELECT
         SUM(page_views) page_views
         FROM
-        dmp_ga_page_path_report
+        adweb_dmp_ga_page_path_report
         WHERE
         site_code = #{siteCode}
         <if test="start != null">

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

@@ -12,7 +12,7 @@
         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
+        adweb_dmp_ga_source_medium_report
         WHERE
         site_code = #{siteCode}
         AND (type not like '%adwebcloud%' and type not like '%advich%') AND type != ''

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

@@ -9,7 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
+ * @Description: adweb_dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface IGACountryReportService extends IService<GACountryReport> {
 

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

@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_daily_report @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
+ * @Description: adweb_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/IGADeviceReportService.java

@@ -9,7 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
+ * @Description: adweb_dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
  */
 public interface IGADeviceReportService extends IService<GADeviceReport> {
 

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

@@ -9,7 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_page_path_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
+ * @Description: adweb_dmp_ga_page_path_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface IGAPagePathReportService extends IService<GAPagePathReport> {
 

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

@@ -9,7 +9,7 @@ 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: adweb_dmp_ga_source_medium_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 public interface IGASourceMediumReportService extends IService<GASourceMediumReport> {
 

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

@@ -5,6 +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: adweb_dmp_google_gtm @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
  */
 public interface IGoogleGTMService extends IService<GoogleGTM> {}

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

@@ -20,7 +20,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
+ * @Description: adweb_dmp_ga_country_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 @Service
 public class GACountryReportServiceImpl extends ServiceImpl<GACountryReportMapper, GACountryReport>

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

@@ -30,7 +30,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
- * @Description: dmp_ga_daily_report @Author: jeecg-boot @Date: 2024-11-04 @Version: V1.0
+ * @Description: adweb_dmp_ga_daily_report @Author: jeecg-boot @Date: 2024-11-04 @Version: V1.0
  */
 @Service
 public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, GADailyReport>

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

@@ -20,7 +20,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
+ * @Description: adweb_dmp_ga_device_report @Author: jeecg-boot @Date: 2024-12-16 @Version: V1.0
  */
 @Service
 @Slf4j

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

@@ -25,7 +25,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: dmp_ga_page_path_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
+ * @Description: adweb_dmp_ga_page_path_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 @Service
 @Slf4j

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

@@ -19,7 +19,7 @@ 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: adweb_dmp_ga_source_medium_report @Author: jeecg-boot @Date: 2024-10-11 @Version: V1.0
  */
 @Service
 public class GASourceMediumReportServiceImpl

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

@@ -8,7 +8,7 @@ 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: adweb_dmp_google_gtm @Author: jeecg-boot @Date: 2024-10-10 @Version: V1.0
  */
 @Service
 public class GoogleGTMServiceImpl extends ServiceImpl<GoogleGTMMapper, GoogleGTM>