message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 5ffa6f6f6bc145af2ef3e9a640da9cc4d7b7079f 1 个父辈 4286fc6d

添加ES查询消息内容

内嵌 并排对比
正在显示 2 个修改的文件 包含 7 行增加 和 0 行删除
@@ -64,6 +64,7 @@ public class MessageNoteController { @@ -64,6 +64,7 @@ public class MessageNoteController {
64 @GetMapping("/list") 64 @GetMapping("/list")
65 public ResultJson selectMessageNoteListFromElasticSearch( 65 public ResultJson selectMessageNoteListFromElasticSearch(
66 @RequestParam(value = "username", required = false) String username, 66 @RequestParam(value = "username", required = false) String username,
  67 + @RequestParam(value = "alias_sendContent", required = false) String alias_sendContent,
67 @RequestParam(value = "serverName", required = false) String serverName, 68 @RequestParam(value = "serverName", required = false) String serverName,
68 @RequestParam(value = "virtualHostName", required = false) String virtualHostName, 69 @RequestParam(value = "virtualHostName", required = false) String virtualHostName,
69 @RequestParam(value = "exchangeName", required = false) String exchangeName, 70 @RequestParam(value = "exchangeName", required = false) String exchangeName,
@@ -78,6 +79,7 @@ public class MessageNoteController { @@ -78,6 +79,7 @@ public class MessageNoteController {
78 // 获取查询参数 79 // 获取查询参数
79 MessageNote messageNote = MessageNote.builder() 80 MessageNote messageNote = MessageNote.builder()
80 .username(username) 81 .username(username)
  82 + .alias_sendContent(alias_sendContent)
81 .serverName(serverName) 83 .serverName(serverName)
82 .virtualHostName(virtualHostName) 84 .virtualHostName(virtualHostName)
83 .exchangeName(exchangeName) 85 .exchangeName(exchangeName)
@@ -78,6 +78,7 @@ public class ElasticsearchService { @@ -78,6 +78,7 @@ public class ElasticsearchService {
78 78
79 79
80 if (StringUtil.isNullOrEmpty(messageNote.getUsername()) 80 if (StringUtil.isNullOrEmpty(messageNote.getUsername())
  81 + && StringUtil.isNullOrEmpty(messageNote.getAlias_sendContent())
81 && StringUtil.isNullOrEmpty(messageNote.getServerName()) 82 && StringUtil.isNullOrEmpty(messageNote.getServerName())
82 && StringUtil.isNullOrEmpty(messageNote.getVirtualHostName()) 83 && StringUtil.isNullOrEmpty(messageNote.getVirtualHostName())
83 && StringUtil.isNullOrEmpty(messageNote.getExchangeName()) 84 && StringUtil.isNullOrEmpty(messageNote.getExchangeName())
@@ -107,6 +108,10 @@ public class ElasticsearchService { @@ -107,6 +108,10 @@ public class ElasticsearchService {
107 WildcardQueryBuilder routingKeyNameQuery = QueryBuilders.wildcardQuery("routingKeyName", messageNote.getRoutingKeyName()); 108 WildcardQueryBuilder routingKeyNameQuery = QueryBuilders.wildcardQuery("routingKeyName", messageNote.getRoutingKeyName());
108 boolQueryBuilder.must(routingKeyNameQuery); 109 boolQueryBuilder.must(routingKeyNameQuery);
109 } 110 }
  111 + if (!StringUtil.isNullOrEmpty(messageNote.getAlias_sendContent())) {
  112 + WildcardQueryBuilder sendContentQuery = QueryBuilders.wildcardQuery("alias_sendContent", messageNote.getAlias_sendContent());
  113 + boolQueryBuilder.must(sendContentQuery);
  114 + }
110 if (messageNote.getSendTimeBegin() != null && messageNote.getSendTimeEnd() != null) { 115 if (messageNote.getSendTimeBegin() != null && messageNote.getSendTimeEnd() != null) {
111 RangeQueryBuilder sendTimeQuery = QueryBuilders.rangeQuery("sendTime") 116 RangeQueryBuilder sendTimeQuery = QueryBuilders.rangeQuery("sendTime")
112 .from(messageNote.getSendTimeBegin(), true) 117 .from(messageNote.getSendTimeBegin(), true)