From f5f378b05c912103a922a12c3f2ad8479b87a344 Mon Sep 17 00:00:00 2001
From: XieChengzhi <xiechengzhi3@h-partners.com>
Date: Tue, 7 Jan 2025 11:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91fix=20delete=20aggre=20typ?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es-client/src/main/java/PublicClient.java | 5 +++++
 openeuler/src/main/java/App.java          | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/es-client/src/main/java/PublicClient.java b/es-client/src/main/java/PublicClient.java
index 87c04a2..47bcc5c 100644
--- a/es-client/src/main/java/PublicClient.java
+++ b/es-client/src/main/java/PublicClient.java
@@ -124,6 +124,11 @@ public static void insert(Map<String, Object> data, String index) throws Excepti
         IndexResponse indexResponse = restHighLevelClient.index(indexRequest, RequestOptions.DEFAULT);
     }
 
+    public static void insertByType(Map<String, Object> data, String index, String type) throws Exception {
+        IndexRequest indexRequest = new IndexRequest(index).id((String) data.get("path") + "/" + type).source(data);
+        IndexResponse indexResponse = restHighLevelClient.index(indexRequest, RequestOptions.DEFAULT);
+    }
+
     public static void deleteExpired(Set<String> idSet, String index) {
         try {
             int scrollSize = 500;//一次读取的doc数量
diff --git a/openeuler/src/main/java/App.java b/openeuler/src/main/java/App.java
index 745a6bb..6c4f7d9 100644
--- a/openeuler/src/main/java/App.java
+++ b/openeuler/src/main/java/App.java
@@ -93,10 +93,10 @@ public static void main(String[] args) {
             PublicClient.CreateClientFormConfig(APPLICATION_PATH);
             PublicClient.makeIndex(INDEX_PREFIX + "_zh", MAPPING_PATH);
             PublicClient.makeIndex(INDEX_PREFIX + "_en", MAPPING_PATH);
+            fileDate();
             sigData();
             etherpadData();
             releaseData();
-            fileDate();
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
             LOGGER.error(e.toString());
@@ -233,7 +233,7 @@ public static void releaseData() {
         try {
             Map<String, Object> escape = Parse.parseAggreReleaseData(files);
             if (null != escape) {
-                PublicClient.insert(escape, INDEX_PREFIX + "_" + escape.get("lang"));
+                PublicClient.insertByType(escape, INDEX_PREFIX + "_" + escape.get("lang"), (String) escape.get("type"));
             } else {
                 LOGGER.info("parse null :" + aggreFile.getPath());
             }
@@ -267,10 +267,8 @@ public static void fileDate() throws Exception {
                 try {
                     Map<String, Object> escape = Parse.parse(paresFile);
                     if (null != escape) {
-                        if (!"packages".equals(escape.get("type"))) {
                             inserDataList.add(escape);
                             idSet.add((String) escape.get("path"));
-                        }
                     } else {
                         LOGGER.info("parse null : " + paresFile.getPath());
                     }