...
|
...
|
@@ -78,6 +78,7 @@ public class ElasticsearchService { |
|
|
|
|
|
|
|
|
if (StringUtil.isNullOrEmpty(messageNote.getUsername())
|
|
|
&& StringUtil.isNullOrEmpty(messageNote.getAlias_sendContent())
|
|
|
&& StringUtil.isNullOrEmpty(messageNote.getServerName())
|
|
|
&& StringUtil.isNullOrEmpty(messageNote.getVirtualHostName())
|
|
|
&& StringUtil.isNullOrEmpty(messageNote.getExchangeName())
|
...
|
...
|
@@ -107,6 +108,10 @@ public class ElasticsearchService { |
|
|
WildcardQueryBuilder routingKeyNameQuery = QueryBuilders.wildcardQuery("routingKeyName", messageNote.getRoutingKeyName());
|
|
|
boolQueryBuilder.must(routingKeyNameQuery);
|
|
|
}
|
|
|
if (!StringUtil.isNullOrEmpty(messageNote.getAlias_sendContent())) {
|
|
|
WildcardQueryBuilder sendContentQuery = QueryBuilders.wildcardQuery("alias_sendContent", messageNote.getAlias_sendContent());
|
|
|
boolQueryBuilder.must(sendContentQuery);
|
|
|
}
|
|
|
if (messageNote.getSendTimeBegin() != null && messageNote.getSendTimeEnd() != null) {
|
|
|
RangeQueryBuilder sendTimeQuery = QueryBuilders.rangeQuery("sendTime")
|
|
|
.from(messageNote.getSendTimeBegin(), true)
|
...
|
...
|
|