修复数据下载报错的问题

liachuan · Mar 17, 2023 · 27e9164 · 27e9164
1 parent 5831f5a
commit 27e9164
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 26 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -9,12 +9,12 @@
 * 【1.0】修复团队名称修改时，监控和组对不上的问题 [2022-11-19]
 * 【1.0】ldap用户验证通过，系统还不存在该用户时自动创建 [2023-01-02]
 * 【1.0】featrue:报警方式增加OneMessage机器人 - [SQL](./doc/mysql-schema/2023-02-24/change.sql) [2023-02-24]
-* 【1.0】bugfix: 解决es8数据下载报错的问题 [2023-03-16]
 
 ### BugFix
 
 * 【1.0】bugfix: 修复es8数据查询排序不生效的问题 [2023-02-23]
 * 【1.0】bugfix: 修复监控执行日志是否报警查询条件不生效的问题 [2023-02-23]
+* 【1.0】bugfix: 解决es8数据下载报错的问题 [2023-03-16]
 
 ### Mysql
 

diff --git a/...va/com/autohome/frostmourne/monitor/dao/elasticsearch/AbstractElasticClientContainer.java b/...va/com/autohome/frostmourne/monitor/dao/elasticsearch/AbstractElasticClientContainer.java
@@ -260,4 +260,17 @@ protected List<String> findFields(Map<String, Object> doc, String parentField) {
         return fields;
     }
 
+    static void fillFields(List<String> headFieldList, ElasticsearchDataResult dataResult, List<String> flatFields) {
+        dataResult.setFlatFields(flatFields);
+        if (headFieldList == null || headFieldList.size() == 0) {
+            if (flatFields.size() > 7) {
+                dataResult.setHeadFields(flatFields.subList(0, 6));
+            } else {
+                dataResult.setHeadFields(flatFields);
+            }
+        } else {
+            dataResult.setHeadFields(headFieldList);
+        }
+    }
+
 }
diff --git a/...ava/com/autohome/frostmourne/monitor/dao/elasticsearch/Elasticsearch8ClientContainer.java b/...ava/com/autohome/frostmourne/monitor/dao/elasticsearch/Elasticsearch8ClientContainer.java
@@ -182,8 +182,6 @@ public ElasticsearchDataResult query(DataNameContract dataNameContract, DateTime
                                 )
                         );
                     }
-
-
                     return q;
                 }, Object.class);
             } else {
@@ -220,17 +218,8 @@ public ElasticsearchDataResult query(DataNameContract dataNameContract, DateTime
             int size = source.keySet().size();
             if(dataResult.getFields() == null || size > dataResult.getFields().size()) {
                 dataResult.setFields(new ArrayList<>(source.keySet()));
-                if (headFieldList == null || headFieldList.size() == 0) {
-                    List<String> flatFields = findFields(source, null);
-                    dataResult.setFlatFields(flatFields);
-                    if (flatFields.size() > 7) {
-                        dataResult.setHeadFields(flatFields.subList(0, 6));
-                    } else {
-                        dataResult.setHeadFields(flatFields);
-                    }
-                } else {
-                    dataResult.setHeadFields(headFieldList);
-                }
+                List<String> flatFields = findFields(source, null);
+                AbstractElasticClientContainer.fillFields(headFieldList, dataResult, flatFields);
             }
         }
         dataResult.setLogs(logs);

diff --git a/...c/main/java/com/autohome/frostmourne/monitor/dao/elasticsearch/EsRestClientContainer.java b/...c/main/java/com/autohome/frostmourne/monitor/dao/elasticsearch/EsRestClientContainer.java
@@ -271,18 +271,8 @@ private ElasticsearchDataResult parseResult(SearchResponse searchResponse, Strin
             int size = hit.getSourceAsMap().keySet().size();
             if (dataResult.getFields() == null || size > dataResult.getFields().size()) {
                 dataResult.setFields(new ArrayList<>(hit.getSourceAsMap().keySet()));
-                if (headFields == null || headFields.size() == 0) {
-                    List<String> flatFields = findFields(hit.getSourceAsMap(), null);
-                    dataResult.setFlatFields(flatFields);
-                    if (flatFields.size() > 7) {
-                        dataResult.setHeadFields(flatFields.subList(0, 6));
-                    } else {
-                        dataResult.setHeadFields(flatFields);
-                    }
-                } else {
-                    dataResult.setHeadFields(headFields);
-                }
-
+                List<String> flatFields = findFields(hit.getSourceAsMap(), null);
+                AbstractElasticClientContainer.fillFields(headFields, dataResult, flatFields);
             }
         }
         dataResult.setLogs(logs);