From d7feb7719d77ab9208ecd665ef1853b3394192d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 25 Mar 2024 18:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8A=A8=E6=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=AD=BB=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/job/HomeSearchCheckEsPlanJob.java    | 20 ++++---------------
 .../impl/LawsHomeSearchServiceImpl.java       | 14 +++++--------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java
index 984c1952..d8df7e5c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java
@@ -179,22 +179,10 @@ public class HomeSearchCheckEsPlanJob implements Job {
     }
 
     private void addES(List<String> listIds, String lawsNewsFeed) {
-        int startIndex = 0; // 从第0个下标开始
-        int batchCount = 1000;
-        while (startIndex < listIds.size()) {
-            int endIndex = 0;
-            if (listIds.size() - batchCount < startIndex) {
-                endIndex = listIds.size();
-            } else {
-                endIndex = startIndex + batchCount;
-            }
-            List<String> ids = listIds.subList(startIndex, endIndex);
-            try {
-                lawsHomeSearchService.updateEsData(lawsNewsFeed, String.join(",", ids), LawsHomeSearchCommon.LAWS_ES_ADD);
-            } catch (Exception e) {
-                log.error("ES同步异常：", e.getMessage());
-            }
-            startIndex = startIndex + batchCount; // 下一批
+        try {
+            lawsHomeSearchService.updateEsData(lawsNewsFeed, String.join(",", listIds), LawsHomeSearchCommon.LAWS_ES_ADD);
+        } catch (Exception e) {
+            log.error("ES同步异常：", e.getMessage());
         }
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index e0d0f4f2..898f2cfa 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -1410,16 +1410,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     private void updateLawsNewsFeedToEs(String resourceType, String ids,String opType) {
         // 批量操作
         // 从第0个下标开始
-        int startIndex = 0;
-        int batchCount = 2000;
         List<String> listIds = Arrays.asList(ids.split(","));
-        // 异步执行
-        while (startIndex < listIds.size()) {
-            int endIndex = getEndIndex(startIndex, batchCount, listIds);
-            List<String> listIdsSub = listIds.subList(startIndex, endIndex);
-            List<LawsNewsFeed> listLawsNewsFeed = lawsNewsFeedService.listByIds(listIdsSub);
+        try {
+            List<LawsNewsFeed> listLawsNewsFeed = lawsNewsFeedService.listByIds(listIds);
             if(CollectionUtils.isEmpty(listLawsNewsFeed)){
-                continue;
+                return;
             }
             for (LawsNewsFeed lawsNewsFeed : listLawsNewsFeed) {
                 try {
@@ -1438,7 +1433,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                     log.error(SYNC_ES_ERR,e.getMessage());
                 }
             }
-            startIndex = startIndex + batchCount; // 下一批
+        }catch (Exception e){
+            log.error(SYNC_ES_ERR,e.getMessage());
         }
     }