diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java index 9e65bf6..fa6c6a4 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java @@ -160,6 +160,11 @@ private static Page budgetQueryPage(Page page, String index, String type, String startTime, String endTime, ElasticSearchQuery query) throws Exception { String method = "POST"; String entPoint = index.concat("/").concat(type).concat("/").concat("_search"); + query.range("logTime", startTime, endTime); + Response response = performRequest(method, entPoint, query.getBody().toString()); + JSONObject result = JSONObject.parseObject(EntityUtils.toString(response.getEntity())); + EsResponse esResponse = result.toJavaObject(EsResponse.class); + page.setTotal(Long.valueOf(esResponse.getHits().getTotal())); JSONObject jsonObject = getOffsetTime(page, startTime, endTime, entPoint, query); if (ObjectUtils.isEmpty(jsonObject)) { return page; @@ -167,9 +172,9 @@ query.removeRange(); query.range("logTime", startTime, (String) jsonObject.get("time")); query.from(Integer.valueOf(String.valueOf(jsonObject.get("from")))); - Response response = performRequest(method, entPoint, query.getBody().toString()); - JSONObject result = JSONObject.parseObject(EntityUtils.toString(response.getEntity())); - EsResponse esResponse = result.toJavaObject(EsResponse.class); + response = performRequest(method, entPoint, query.getBody().toString()); + result = JSONObject.parseObject(EntityUtils.toString(response.getEntity())); + esResponse = result.toJavaObject(EsResponse.class); List results = esResponse.getDatas(); page.setRecords(results); page.setTotal(Long.valueOf(esResponse.getHits().getTotal()));