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 6cd932a..70f47d7 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 @@ -145,6 +145,7 @@ Long currentSize = page.getSize() * page.getCurrent(); if (currentSize < 10000) { query.range("logTime", startTime, endTime); + query.from(Integer.valueOf(String.valueOf(page.getCurrent() * page.getSize()))); return searchQueryPage(page, index, type, query); } else { return budgetQueryPage(page, index, type, startTime, endTime, query); @@ -183,7 +184,7 @@ while (true) { EsResponse leftTotal = mergerQueryTime(startTime, newEndTime, query, entPoint); Integer rightTotal = mergerQuery(newEndTime, endTime, query, entPoint); - if (currentSize - rightTotal < 10000&¤tSize - rightTotal >0) { + if (currentSize - rightTotal < 10000 && currentSize - rightTotal > 0) { JSONObject jsonObject = new JSONObject(); jsonObject.put("time", newEndTime); jsonObject.put("from", currentSize - rightTotal);