Merge branch 'master' into cpq-dev

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>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/SubUserEmail.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("sub_user_email")
+@TableName("adweb_sub_user_email")
 public class SubUserEmail implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -5,6 +5,6 @@
 
     <delete id="removeAll">
         DELETE
-        FROM sub_user_email
+        FROM adweb_sub_user_email
     </delete>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/googleads/entity/GoogleAds.java

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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/googleads/mapper/GoogleAdsMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.adweb.marketing.googleads.entity.GoogleAds;
 
 /**
- * @Description: marketing_google_ads
+ * @Description: adweb_marketing_google_ads
  * @Author: jeecg-boot
  * @Date:   2024-12-06
  * @Version: V1.0

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/googleads/service/IGoogleAdsService.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.adweb.marketing.googleads.entity.GoogleAds;
 
 /**
- * @Description: marketing_google_ads
+ * @Description: adweb_marketing_google_ads
  * @Author: jeecg-boot
  * @Date:   2024-12-06
  * @Version: V1.0

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/googleads/service/impl/GoogleAdsServiceImpl.java

@@ -8,7 +8,7 @@ import org.jeecg.modules.adweb.marketing.googleads.service.IGoogleAdsService;
 import org.springframework.stereotype.Service;
 
 /**
- * @Description: marketing_google_ads
+ * @Description: adweb_marketing_google_ads
  * @Author: jeecg-boot
  * @Date:   2024-12-06
  * @Version: V1.0

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/quota/controller/ResourceQuotaController.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.adweb.quota.controller;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.adweb.quota.vo.ResourceQuota;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 用户资源额度 - 临时站数量、AI算力、外贸大数据等
+ *
+ * @author wfansh
+ */
+@RestController
+@RequestMapping("/resourceQuota")
+@Slf4j
+public class ResourceQuotaController {
+
+    @GetMapping("/getByUid")
+    @ResponseBody
+    public Result<ResourceQuota> getByUid(@RequestParam String uid) {
+        ResourceQuota resourceQuota = new ResourceQuota();
+        resourceQuota.setUid(uid);
+
+        return Result.OK(resourceQuota);
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/quota/vo/ResourceQuota.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.adweb.quota.vo;
+
+import lombok.Data;
+
+/**
+ * @author wfansh
+ */
+@Data
+public class ResourceQuota {
+    private String uid;
+
+    private long websitesQuota;
+    private long websitesUsed;
+
+    private long aiPowerQuota;
+    private long aiPowerUsed;
+
+    private long customsDataQuota;
+    private long customsDataUsed;
+}

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

@@ -17,9 +17,9 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: seo_keywords_rank @Author: jeecg-boot @Date: 2024-10-09 @Version: V1.0
+ * @Description: adweb_seo_keywords_rank @Author: jeecg-boot @Date: 2024-10-09 @Version: V1.0
  */
-@Tag(name = "seo_keywords_rank")
+@Tag(name = "adweb_seo_keywords_rank")
 @RestController
 @RequestMapping("/seo/seoKeywordsRank")
 @Slf4j

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoKeywords.java

@@ -25,7 +25,7 @@ import java.util.Map;
  * @Version: V1.0
  */
 @Data
-@TableName("seo_keywords")
+@TableName("adweb_seo_keywords")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "关键词")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoKeywordsSerp.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("seo_keywords_serp")
+@TableName("adweb_seo_keywords_serp")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "SEO关键词搜索排名")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoPlanSubscription.java

@@ -21,7 +21,7 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("seo_plan_subscription")
+@TableName("adweb_seo_plan_subscription")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "seo套餐订购")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/SeoPlanSubscriptionMapper.java

@@ -30,7 +30,7 @@ public interface SeoPlanSubscriptionMapper extends BaseMapper<SeoPlanSubscriptio
      * @Date: 2021/4/6
      */
     @Select("select t1.plan_name planName, t1.keyword_count keywordCount, t1.service_time serviceTime, t1.price price,t2.plan_id planId " +
-            "from subscribe_plan t1 ,seo_plan_subscription t2 " +
+            "from adweb_subscribe_plan t1 ,adweb_seo_plan_subscription t2 " +
             "where t1.id = t2.plan_id AND t2.site_id = #{siteId} AND t2.status = 1")
     Map<String, String> getSubscribePlanBySiteId(Integer siteId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoKeywordsMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="org.jeecg.modules.adweb.seo.mapper.SeoKeywordsMapper">
     <select id="getKeywordsLastSevenDays" resultType="java.lang.String">
         SELECT t1.se_date
-        FROM seo_keywords_serp t1,
-             seo_keywords t2
+        FROM adweb_seo_keywords_serp t1,
+             adweb_seo_keywords t2
         WHERE t2.`status` = 1
           AND t1.keywords_id = t2.id
           AND t2.app_key = 'adweb'
@@ -25,7 +25,7 @@
         t1.id,
         t1.keyword_type type
         FROM
-        seo_keywords t1
+        adweb_seo_keywords t1
         WHERE
         t1.site_code = #{siteCode}
         AND `status` = 1
@@ -49,8 +49,8 @@
         SELECT
         keywords_id,MAX(t1.rank_absolute) max_rank
         FROM
-        seo_keywords_serp t1,
-        seo_keywords t2
+        adweb_seo_keywords_serp t1,
+        adweb_seo_keywords t2
         WHERE
         t2.`status` = 1
         AND t1.keywords_id = t2.id
@@ -79,7 +79,7 @@
             IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
         FROM
             seo_market_plan t1,
-            seo_plan_subscription t2,
+            adweb_seo_plan_subscription t2,
             adweb_site t3
         WHERE
             t2.`status` = 1
@@ -91,7 +91,7 @@
         SELECT
         DISTINCT t1.*,CHAR_LENGTH( keywords ) keywordsLength
         FROM
-        seo_keywords t1
+        adweb_seo_keywords t1
         <where>
 
             <if test="keyword != null and keyword != ''">
@@ -125,8 +125,8 @@
             SELECT
             keywords_id,MAX(t1.rank_absolute) max_rank
             FROM
-            seo_keywords_serp t1,
-            seo_keywords t2
+            adweb_seo_keywords_serp t1,
+            adweb_seo_keywords t2
             WHERE
             t2.`status` = 1
             AND t1.keywords_id = t2.id
@@ -165,7 +165,7 @@
         SELECT
         *
         FROM
-        seo_keywords
+        adweb_seo_keywords
         WHERE
         status = 1
         AND
@@ -186,7 +186,7 @@
         SELECT
         *,CHAR_LENGTH( t1.keywords ) keywordsLength
         FROM
-        seo_keywords t1
+        adweb_seo_keywords t1
         WHERE
         t1.`status` = 1
         AND t1.app_key = 'adweb'
@@ -233,7 +233,7 @@
         SELECT
         *,CHAR_LENGTH( t1.keywords ) keywordsLength
         FROM
-        seo_keywords t1
+        adweb_seo_keywords t1
         WHERE
         t1.`status` = 1
         AND t1.app_key = 'adweb'
@@ -281,7 +281,7 @@
         SELECT
         *
         FROM
-        seo_keywords t1
+        adweb_seo_keywords t1
         WHERE
         t1.`status` = 1
         AND t1.app_key = 'adweb'
@@ -321,7 +321,7 @@
             t1.id,
             t1.plan_id
         FROM
-            seo_plan_subscription t1,
+            adweb_seo_plan_subscription t1,
             adweb_site t2
         WHERE
             t1.site_id = t2.id

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoKeywordsSerpMapper.xml

@@ -6,7 +6,7 @@
         SELECT
         *
         FROM
-        seo_keywords_serp
+        adweb_seo_keywords_serp
         WHERE
         keywords_id = #{keywordId}
         ORDER BY
@@ -16,8 +16,8 @@
     <select id="getSeoKeywordsRank" resultType="org.jeecg.modules.adweb.seo.vo.KeywordsInfoVO">
         SELECT
             t2.keywords,t1.keywords_id,t2.domain as position_url,t1.rank_absolute as lastRank,t1.se_datetime,t2.keyword_type
-        FROM seo_keywords_serp t1,
-             seo_keywords t2
+        FROM adweb_seo_keywords_serp t1,
+             adweb_seo_keywords t2
         WHERE
             t1.keywords_id = t2.id
         AND

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoPlanSubscriptionMapper.xml

@@ -5,8 +5,8 @@
         SELECT
             IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
         FROM
-            subscribe_plan t1,
-            seo_plan_subscription t2,
+            adweb_subscribe_plan t1,
+            adweb_seo_plan_subscription t2,
             adweb_site t3
         WHERE
             t2.`status` = 1

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/dataforseo/DataForSEOService.java

@@ -179,7 +179,7 @@ public class DataForSEOService {
                 serpingKeywordIds.add(Integer.parseInt(keywordId));
             }
 
-            // 4. 更新seo_keywords表
+            // 4. 更新adweb_seo_keywords表
             List<SeoKeywords> serpingKeywords =
                     seoKeywords.stream()
                             .filter(keyword -> serpingKeywordIds.contains(keyword.getId()))
@@ -231,7 +231,7 @@ public class DataForSEOService {
             }
             SerpGoogleOrganicTaskGetRegularResultInfo serpResult = serpTask.getResult().get(0);
 
-            // 2. 查询seo_keywords表，根据域名过滤Serp result items
+            // 2. 查询adweb_seo_keywords表，根据域名过滤Serp result items
             int keywordId = Integer.parseInt(this.getKeywordIdFromRedisKey(serpTaskRedisKey));
             SeoKeywords seoKeyword = seoKeywordsService.getById(keywordId);
             if (Objects.isNull(seoKeyword)) {
@@ -261,7 +261,7 @@ public class DataForSEOService {
             int rankGroup = Objects.nonNull(serpItem) ? serpItem.getRankGroup() : 0;
             int rankAbsolute = Objects.nonNull(serpItem) ? serpItem.getRankAbsolute() : 0;
 
-            // 3.更新seo_keywords表
+            // 3.更新adweb_seo_keywords表
             UpdateWrapper<SeoKeywords> seoKeywordsUpdateWrapper = new UpdateWrapper<>();
             seoKeywordsUpdateWrapper.eq("id", keywordId);
             seoKeywordsUpdateWrapper.set("last_search_time", seDatetime);
@@ -270,7 +270,7 @@ public class DataForSEOService {
             seoKeywordsUpdateWrapper.set("search_status", 0); // 状态 -> 查询结束
             seoKeywordsService.update(seoKeywordsUpdateWrapper);
 
-            // 4. 更新seo_keywords_serp表
+            // 4. 更新adweb_seo_keywords_serp表
             // 4.1 填充与上次更新时间之间的数据, 截止到seDatetime的前一天
             seoKeywordsSerpService.fillKeywordsSerpHistory(keywordId, seDatetime);
             // 4.2 更新Serp表

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsSerpServiceImpl.java

@@ -29,7 +29,7 @@ public class SeoKeywordsSerpServiceImpl extends ServiceImpl<SeoKeywordsSerpMappe
     @Autowired private SeoKeywordsSerpMapper seoKeywordsSerpMapper;
 
     /**
-     * 向seo_keywords_serp表中补充数据，截止到seDatetime的前一天
+     * 向adweb_seo_keywords_serp表中补充数据，截止到seDatetime的前一天
      *
      * @param keywordId 关键词ID
      * @param seDatetime serp返回时间，此日期不需要填充

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/entity/Sohoeb2bOrder.java

@@ -19,7 +19,7 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("sohoeb2b_order")
+@TableName("adweb_sohoeb2b_order")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "苏豪通订单地址配置表")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/entity/SubscribePlan.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
  * @Version: V1.0
  */
 @Data
-@TableName("subscribe_plan")
+@TableName("adweb_subscribe_plan")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "网站营销方案套餐表")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/mapper/xml/SubscribePlanMapper.xml

@@ -7,8 +7,8 @@
         SELECT
             t1.id,t1.plan_name,specify_keyword,long_tail_keyword,external_links,article
         from
-            subscribe_plan t1,
-            seo_plan_subscription t2
+            adweb_subscribe_plan t1,
+            adweb_seo_plan_subscription t2
         where
             t1.id = t2.plan_id
             and t1.status = 1

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

@@ -16,7 +16,7 @@ import java.util.Date;
  * “Adweb会员”主账户和子账户对应关系
  */
 @Data
-@TableName("master_sub_account_relation")
+@TableName("adweb_master_sub_account_relation")
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "MasterSubAccountRelation")
 public class MasterSubAccountRelation implements Serializable {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/userCountry/mapper/xml/AdwebUserCountryMapper.xml

@@ -10,7 +10,7 @@
             COUNT(DISTINCT t1.country_id) countryNum,
             enquiryCount enquiryNum
         FROM
-            master_sub_account_relation t0
+            adweb_master_sub_account_relation t0
             LEFT JOIN adweb_user_country t1 ON t0.sub_id = t1.uid AND t1.`status` = 1 AND t1.site_id IN
             <foreach collection="siteIds" open="(" close=")" separator="," item="siteId">
                 #{siteId}
@@ -43,7 +43,7 @@
             t1.id,
             t1.realname username
         FROM
-            master_sub_account_relation t0,
+            adweb_master_sub_account_relation t0,
             sys_user t1
         WHERE
             t0.sub_id = t1.id