From a908074090daaac60a15a20ae2cd29a85f7b3a49 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Mon, 28 Jan 2019 11:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84es=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=A1=E6=95=B0=E5=8F=AF=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E9=BB=98=E8=AE=A4=E7=9A=8410?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/history/HistoryFlightDataController.java     | 6 +++++-
 src/main/resources/application-dev.yml                      | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
index 218ab3a..aa372b9 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
@@ -9,6 +9,7 @@ import java.util.Map;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.sort.SortOrder;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +28,9 @@ import com.gzzn.omms.adminapi.utils.DateUtils;
 @RestController
 public class HistoryFlightDataController {
 	
+	@Value("${elasticsearch.maxSize}")
+	private Integer maxSize; //es单次返回最大条数
+	
 	/**
 	* 历史航班数据索引
 	*/
@@ -79,7 +83,7 @@ public class HistoryFlightDataController {
 		}
 		String sortField = "SODT";//计划时间 默认倒序
 		SortOrder sortOrder =  SortOrder.ASC;
-		List<Map<String, Object>>  list = ElasticsearchUtil.searchListData(INDEX_NAME, ES_TYPE, boolQuery, null, null, sortField,sortOrder, null);
+		List<Map<String, Object>>  list = ElasticsearchUtil.searchListData(INDEX_NAME, ES_TYPE, boolQuery, maxSize, null, sortField,sortOrder, null);
 		return ResponseDto.success(list);
 	}
 	
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4857963..8b22b1b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -60,4 +60,5 @@ elasticsearch:
   pool: 5
   #注意cluster.name需要与config/elasticsearch.yml中的cluster.name一致
   cluster:
-    name: docker-cluster
\ No newline at end of file
+    name: docker-cluster
+  maxSize: 10000
\ No newline at end of file