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

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/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/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
@@ -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'

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/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/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