Commit 21e950ad by 黄明步

.

parent 41f028f2
...@@ -29,6 +29,9 @@ public class RecordDto implements Serializable { ...@@ -29,6 +29,9 @@ public class RecordDto implements Serializable {
private List<String> ipScopeList; private List<String> ipScopeList;
private Integer page; private Integer page;
private Integer limit; private Integer limit;
/**
* 内网或内网,-1:全部,0:内网,1:外网
*/
private Integer network; private Integer network;
} }
...@@ -338,7 +338,6 @@ public class ElasticSearchService { ...@@ -338,7 +338,6 @@ public class ElasticSearchService {
recordDto.setLimit(ObjUtil.isNull(recordDto.getLimit()) ? 10 : recordDto.getLimit()); recordDto.setLimit(ObjUtil.isNull(recordDto.getLimit()) ? 10 : recordDto.getLimit());
int offset = (recordDto.getPage() - 1) * recordDto.getLimit() + recordDto.getLimit() > 10000 ? RandomUtil.randomInt(100, 200) : (recordDto.getPage() - 1) * recordDto.getLimit(); int offset = (recordDto.getPage() - 1) * recordDto.getLimit() + recordDto.getLimit() > 10000 ? RandomUtil.randomInt(100, 200) : (recordDto.getPage() - 1) * recordDto.getLimit();
int size = recordDto.getLimit(); int size = recordDto.getLimit();
System.out.println(recordDto);
SearchResponse<AppAbilityRecord> searchResponse = client.search(srBuilder -> srBuilder SearchResponse<AppAbilityRecord> searchResponse = client.search(srBuilder -> srBuilder
.index(APP_ABILITY_RECORD_INDEX) .index(APP_ABILITY_RECORD_INDEX)
.query(queryBuilder -> queryBuilder.bool(boolQuery -> { .query(queryBuilder -> queryBuilder.bool(boolQuery -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment