From e3cd4adf703c41d23986d43ba5fe446d40d59664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 28 Nov 2023 12:00:08 +0800
Subject: [PATCH] =?UTF-8?q?ES=E5=BC=82=E6=AD=A5=E5=90=8C=E6=AD=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/job/HomeSearchCheckEsPlanJob.java    | 15 ++----
 .../impl/LawsHomeSearchServiceImpl.java       | 51 ++++++++++---------
 2 files changed, 32 insertions(+), 34 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 e2b96a9d..5dbfd2d5 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
@@ -178,16 +178,11 @@ public class HomeSearchCheckEsPlanJob implements Job {
                 endIndex = startIndex + batchCount;
             }
             List<String> ids = listIds.subList(startIndex, endIndex);
-            // 异步生成记录
-            ForkJoinPool pool = new ForkJoinPool();
-            // 异步调用
-            CompletableFuture.runAsync(() -> {
-                try {
-                    lawsHomeSearchService.updateEsData(lawsNewsFeed, String.join(",", ids), LawsHomeSearchCommon.LAWS_ES_ADD);
-                } catch (Exception e) {
-                    log.error("ES同步异常：", e.getMessage());
-                }
-            }, pool);
+            try {
+                lawsHomeSearchService.updateEsData(lawsNewsFeed, String.join(",", ids), LawsHomeSearchCommon.LAWS_ES_ADD);
+            } catch (Exception e) {
+                log.error("ES同步异常：", e.getMessage());
+            }
             startIndex = startIndex + batchCount; // 下一批
         }
     }
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 cf551597..ba890e2f 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
@@ -842,31 +842,34 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
             throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED);
         }
         log.info("================ES更新数据开始=================");
-        try{
-            //判断索引是否存在
-            boolean flagTemp;
-            flagTemp = jeroElasticsearchTemplate.indexExists(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue());
-            if (!flagTemp) {
-                jeroElasticsearchTemplate.createIndex(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue());
+        ForkJoinPool pool = new ForkJoinPool();
+        CompletableFuture.runAsync(()->{
+            try{
+                //判断索引是否存在
+                boolean flagTemp;
+                flagTemp = jeroElasticsearchTemplate.indexExists(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue());
+                if (!flagTemp) {
+                    jeroElasticsearchTemplate.createIndex(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue());
+                }
+                switch (resourceType){
+                    case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD:
+                        updateLawsDomesticStandardToEs(resourceType,ids,opType);
+                        break;
+                    case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD:
+                        updateLawsOverseasStandardToEs(resourceType,ids,opType);
+                        break;
+                    case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD:
+                        updateLawsEnterpriseStandardToEs(resourceType,ids,opType);
+                        break;
+                    case LawsHomeSearchCommon.LAWS_NEWS_FEED:
+                        updateLawsNewsFeedToEs(resourceType,ids,opType);
+                        break;
+                    default:break;
+                }
+            }catch (Exception e){
+                log.error("ES同步异常",e.getMessage());
             }
-            switch (resourceType){
-                case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD:
-                    updateLawsDomesticStandardToEs(resourceType,ids,opType);
-                    break;
-                case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD:
-                    updateLawsOverseasStandardToEs(resourceType,ids,opType);
-                    break;
-                case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD:
-                    updateLawsEnterpriseStandardToEs(resourceType,ids,opType);
-                    break;
-                case LawsHomeSearchCommon.LAWS_NEWS_FEED:
-                    updateLawsNewsFeedToEs(resourceType,ids,opType);
-                    break;
-                default:break;
-            }
-        }catch (Exception e){
-            log.error("ES同步异常",e.getMessage());
-        }
+        },pool);
         log.info("================ES更新数据结束=================");
     }