Merge branch 'master' of http://124.222.105.7:3000/dianliang/dl_site_system

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiKeywordItemMapper.java

@@ -24,7 +24,7 @@ public interface BusiKeywordItemMapper extends BaseMapper<BusiKeywordItem>
 {
     IPage<BusiKeywordItem> queryListPage(@Param("entity") BusiKeywordItem entity, Page<BusiKeywordItem> page);
 
-    int deleteBySelectDateInt(@Param("date") String date);
+    int deleteBySelectDateInt(@Param("date") String date,@Param("title") String title);
 
     /**
      * 分页查询关键词基础信息

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiKeywordItemServiceImpl.java

@@ -56,8 +56,6 @@ public class BusiKeywordItemServiceImpl extends ServiceImpl<BusiKeywordItemMappe
         List<BaseSite> siteList = baseSiteService.list();
         Map<String,String> siteMap = siteList.stream().collect(Collectors.toMap(BaseSite::getId, BaseSite::getSiteUrl));
         List<BusiKeyword> keywordList = busiKeywordService.list();
-        //删除今日所有的排名数据
-        busiKeywordItemMapper.deleteBySelectDateInt(DateUtil.formatDate(nowDate));
         List<BusiKeywordItem> insertList = new ArrayList<>();
         for (BusiKeyword keyword : keywordList) {
             BusiKeywordItem busiKeywordItem = new BusiKeywordItem();
@@ -65,12 +63,13 @@ public class BusiKeywordItemServiceImpl extends ServiceImpl<BusiKeywordItemMappe
             busiKeywordItem.setSelectDate(nowDate);
             int ranking = GoogleUtil.getGoogleRank(keyword.getId(), siteMap.get(keyword.getTenantId()));
             if(ranking>0 && ranking<=20){
+                //找到今天的排名
                 busiKeywordItem.setRanking(ranking);
-            }else{
-                busiKeywordItem.setRanking(0);
-            }
                 busiKeywordItem.setTenantId(keyword.getTenantId());
                 insertList.add(busiKeywordItem);
+                //删除这个关键词今天的排名
+                busiKeywordItemMapper.deleteBySelectDateInt(DateUtil.formatDate(nowDate),busiKeywordItem.getTitle());
+            }
         }
         if(!insertList.isEmpty()){
             this.saveBatch(insertList);

dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiKeywordItemMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, title, select_date, ranking, tenant_id from dl_busi_keyword_item
     </sql>
     <delete id="deleteBySelectDateInt">
-        delete from dl_busi_keyword_item where select_date = #{date}
+        delete from dl_busi_keyword_item where select_date = #{date} AND title = #{title}
     </delete>
 
     <select id="queryListPage" parameterType="BusiKeywordItem" resultMap="BusiKeywordItemResult">

dl_admin/ruoyi-common/src/main/java/com/ruoyi/common/utils/GoogleUtil.java

@@ -252,7 +252,7 @@ public class GoogleUtil {
             String sysProp = System.getProperty("webdriver.chrome.driver");
             String envProp = System.getenv("CHROMEDRIVER_PATH");
             if (sysProp == null || sysProp.isEmpty()) {
-                String path = (envProp != null && !envProp.isEmpty()) ? envProp : "D:/chromedriver.exe";
+                String path = (envProp != null && !envProp.isEmpty()) ? envProp : "D:/chromedriver-win64/chromedriver.exe";
                 System.setProperty("webdriver.chrome.driver", path);
                 log.info("使用ChromeDriver路径: {}", path);
             } else {
@@ -530,11 +530,14 @@ public class GoogleUtil {
 
     // 测试方法
     public static void main(String[] args) {
+        for (int i = 0; i < 5; i++) {
             // 测试用例：搜索关键词，查找特定网站的排名
             int rank1 =   getGoogleRank("大卡车", "zh.wikipedia.org");
             System.out.println("维基百科排名：" + formatRank(rank1));
         }
 
+    }
+
     /**
      * 提取并规范化 host
      */