Data for seo

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

@@ -27,10 +27,10 @@ public interface SeoKeywordsMapper extends BaseMapper<SeoKeywords> {
     /**
      * 查询关键词排名数据
      *
-     * @param userFlag siteCode
+     * @param siteCode siteCode
      * @return 当日排名在前n页的数量
      */
-    RankInfoVO queryKeywordNumByRankRange(@Param("userFlag") String userFlag, @Param("historyId") String historyId, @Param("rankStart") Integer rankStart, @Param("rankEnd") Integer rankEnd, @Param("dateStr") String dateStr, @Param("keywordType") String keywordType);
+    RankInfoVO queryKeywordNumByRankRange(@Param("siteCode") String siteCode, @Param("historyId") String historyId, @Param("rankStart") Integer rankStart, @Param("rankEnd") Integer rankEnd, @Param("dateStr") String dateStr, @Param("keywordType") String keywordType);
 
     /**
      * 根据站点code获取关键词达标标准

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

@@ -8,9 +8,9 @@
         WHERE t2.`status` = 1
           AND t1.keywords_id = t2.id
           AND t2.app_key = 'adweb'
-          AND t2.user_flag = #{siteCode}
+          AND t2.site_code = #{siteCode}
           AND t2.keyword_type = #{keywordType}
-          AND t2.history_id = #{historyId}
+          AND t2.subscription_id = #{subscriptionId}
         GROUP BY t1.se_date
         ORDER BY t1.se_date DESC
         LIMIT 7
@@ -27,10 +27,10 @@
         FROM
         seo_keywords t1
         WHERE
-        t1.user_flag = #{userFlag}
+        t1.site_code = #{siteCode}
         AND `status` = 1
         AND keyword_type = #{keywordType}
-        AND history_id = #{historyId}
+        AND subscription_id = #{subscriptionId}
         <if test="rankStart != null">
             AND t1.last_rank >= #{rankStart}
         </if>
@@ -55,14 +55,14 @@
         t2.`status` = 1
         AND t1.keywords_id = t2.id
         AND t2.app_key = 'adweb'
-        <if test="userFlag != null and userFlag != ''">
-            AND t2.user_flag = #{userFlag}
+        <if test="siteCode != null and siteCode != ''">
+            AND t2.site_code = #{siteCode}
         </if>
         <if test="keywordType != null">
             AND t2.keyword_type = #{keywordType}
         </if>
-        <if test="!historyId">
-            AND t2.history_id = #{historyId}
+        <if test="!subscriptionId">
+            AND t2.subscription_id = #{subscriptionId}
         </if>
         AND se_date IN ${dateStr}
         GROUP BY keywords_id
@@ -98,7 +98,7 @@
                 AND t1.keywords LIKE CONCAT('%', #{keyword}, '%')
             </if>
             <if test="siteCode != null and siteCode != ''">
-                AND t1.user_flag = #{siteCode}
+                AND t1.site_code = #{siteCode}
             </if>
             <if test="keywordType != null">
                 AND t1.keyword_type = #{keywordType}
@@ -111,8 +111,8 @@
             </if>
             AND t1.app_key = 'adweb'
             AND t1.`status` =  1
-            <if test="!historyId">
-                AND t1.history_id = #{historyId}
+            <if test="!subscriptionId">
+                AND t1.subscription_id = #{subscriptionId}
             </if>
             AND
             (
@@ -132,13 +132,13 @@
             AND t1.keywords_id = t2.id
             AND t2.app_key = 'adweb'
             <if test="siteCode != null and siteCode != ''">
-                AND t2.user_flag = #{siteCode}
+                AND t2.site_code = #{siteCode}
             </if>
             <if test="keywordType != null">
                 AND t2.keyword_type = #{keywordType}
             </if>
-            <if test="!historyId">
-                AND t2.history_id = #{historyId}
+            <if test="!subscriptionId">
+                AND t2.subscription_id = #{subscriptionId}
             </if>
             AND se_date IN ${datesStr}
             GROUP BY keywords_id
@@ -160,4 +160,25 @@
         </if>
         ,create_time
     </select>
+
+    <select id="getKeywordsToSerp" resultType="org.jeecg.modules.adweb.serp.entity.SeoKeywords">
+        SELECT
+        *
+        FROM
+        seo_keywords
+        WHERE
+        `status` = 1
+        AND site_code IN (
+        SELECT
+        `code`
+        FROM
+        adweb_site
+        WHERE
+        run_status = 1
+        AND `status` = 1
+        )
+        <if test = "keywordType != null">
+            AND keyword_type = #{keywordType}
+        </if>
+    </select>
 </mapper>

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

@@ -0,0 +1,2 @@
+package org.jeecg.modules.adweb.serp.service.dataforseo;public class DataForSEOService {
+}

jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/adweb/seo/service/DataForSEOTest.java

@@ -4,6 +4,7 @@ import io.github.dataforseo.client.api.SerpApi;
 import io.github.dataforseo.client.model.SerpGoogleOrganicLiveAdvancedRequestInfo;
 import io.github.dataforseo.client.model.SerpGoogleOrganicLiveAdvancedResponseInfo;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -19,6 +20,7 @@ public class DataForSEOTest {
     @Autowired private SerpApi serpApi;
 
     @Test
+    @Disabled("DataForSEO API charges")
     public void testSerpGoogleOrganic() throws Exception {
         SerpGoogleOrganicLiveAdvancedRequestInfo task =
                 new SerpGoogleOrganicLiveAdvancedRequestInfo();