message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 19629ab36a99e83e1523000e06148408a8abaf66 1 个父辈 ef2769d3

ES相关接口，基本完善

内嵌 并排对比
正在显示 3 个修改的文件 包含 12 行增加 和 11 行删除
@@ -3,7 +3,7 @@ target/ @@ -3,7 +3,7 @@ target/
3 !.mvn/wrapper/maven-wrapper.jar 3 !.mvn/wrapper/maven-wrapper.jar
4 !**/src/main/** 4 !**/src/main/**
5 !**/src/test/** 5 !**/src/test/**
6 - 6 +*.log
7 ### STS ### 7 ### STS ###
8 .apt_generated 8 .apt_generated
9 .classpath 9 .classpath
@@ -23,7 +23,7 @@ import java.util.Date; @@ -23,7 +23,7 @@ import java.util.Date;
23 @Builder 23 @Builder
24 @AllArgsConstructor 24 @AllArgsConstructor
25 @NoArgsConstructor 25 @NoArgsConstructor
26 -@Document(indexName = "message_note") 26 +@Document(indexName = "message")
27 public class MessageNote implements Serializable { 27 public class MessageNote implements Serializable {
28 28
29 private static final long serialVersionUID = -2119333801860569470L; 29 private static final long serialVersionUID = -2119333801860569470L;
@@ -42,7 +42,7 @@ public class MessageNote implements Serializable { @@ -42,7 +42,7 @@ public class MessageNote implements Serializable {
42 /** 42 /**
43 * 所属用户登陆名称 43 * 所属用户登陆名称
44 */ 44 */
45 - @Field(type = FieldType.Text, analyzer = "ik_max_word") 45 + @Field(type = FieldType.Keyword)
46 private String username; 46 private String username;
47 47
48 /** 48 /**
@@ -54,7 +54,7 @@ public class MessageNote implements Serializable { @@ -54,7 +54,7 @@ public class MessageNote implements Serializable {
54 /** 54 /**
55 * 所属服务器名称 55 * 所属服务器名称
56 */ 56 */
57 - @Field(type = FieldType.Text, analyzer = "ik_max_word") 57 + @Field(type = FieldType.Keyword)
58 private String serverName; 58 private String serverName;
59 59
60 /** 60 /**
@@ -66,7 +66,7 @@ public class MessageNote implements Serializable { @@ -66,7 +66,7 @@ public class MessageNote implements Serializable {
66 /** 66 /**
67 * 所属虚拟主机名称 67 * 所属虚拟主机名称
68 */ 68 */
69 - @Field(type = FieldType.Text, analyzer = "ik_max_word") 69 + @Field(type = FieldType.Keyword)
70 private String virtualHostName; 70 private String virtualHostName;
71 71
72 /** 72 /**
@@ -78,7 +78,7 @@ public class MessageNote implements Serializable { @@ -78,7 +78,7 @@ public class MessageNote implements Serializable {
78 /** 78 /**
79 * 所属交换机名称 79 * 所属交换机名称
80 */ 80 */
81 - @Field(type = FieldType.Text, analyzer = "ik_max_word") 81 + @Field(type = FieldType.Keyword)
82 private String exchangeName; 82 private String exchangeName;
83 83
84 /** 84 /**
@@ -90,7 +90,7 @@ public class MessageNote implements Serializable { @@ -90,7 +90,7 @@ public class MessageNote implements Serializable {
90 /** 90 /**
91 * 所属队列名称 91 * 所属队列名称
92 */ 92 */
93 - @Field(type = FieldType.Text, analyzer = "ik_max_word") 93 + @Field(type = FieldType.Keyword)
94 private String queueName; 94 private String queueName;
95 95
96 /** 96 /**
@@ -102,7 +102,7 @@ public class MessageNote implements Serializable { @@ -102,7 +102,7 @@ public class MessageNote implements Serializable {
102 /** 102 /**
103 * 所属路由键的名称 103 * 所属路由键的名称
104 */ 104 */
105 - @Field(type = FieldType.Text, analyzer = "ik_max_word") 105 + @Field(type = FieldType.Keyword)
106 private String routingKeyName; 106 private String routingKeyName;
107 107
108 /** 108 /**
@@ -141,7 +141,7 @@ public class MessageNote implements Serializable { @@ -141,7 +141,7 @@ public class MessageNote implements Serializable {
141 /** 141 /**
142 * 发送消息内容,别名 142 * 发送消息内容,别名
143 */ 143 */
144 - @Field(type = FieldType.Text, analyzer = "ik_max_word") 144 + @Field(type = FieldType.Text, analyzer = "ik_smart", searchAnalyzer = "ik_max_word")
145 private String alias_sendContent; 145 private String alias_sendContent;
146 146
147 /** 147 /**
@@ -51,7 +51,7 @@ public class ElasticsearchService { @@ -51,7 +51,7 @@ public class ElasticsearchService {
51 public ResultJson selectMessageNoteList(MessageNote messageNote, Integer pageNum, Integer pageSize) throws IOException 51 public ResultJson selectMessageNoteList(MessageNote messageNote, Integer pageNum, Integer pageSize) throws IOException
52 { 52 {
53 // 条件搜索 53 // 条件搜索
54 - SearchRequest searchRequest = new SearchRequest("message_note"); 54 + SearchRequest searchRequest = new SearchRequest("message");
55 SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); 55 SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
56 56
57 // 高亮设置 57 // 高亮设置
@@ -109,7 +109,8 @@ public class ElasticsearchService { @@ -109,7 +109,8 @@ public class ElasticsearchService {
109 boolQueryBuilder.must(routingKeyNameQuery); 109 boolQueryBuilder.must(routingKeyNameQuery);
110 } 110 }
111 if (!StringUtil.isNullOrEmpty(messageNote.getAlias_sendContent())) { 111 if (!StringUtil.isNullOrEmpty(messageNote.getAlias_sendContent())) {
112 - WildcardQueryBuilder sendContentQuery = QueryBuilders.wildcardQuery("alias_sendContent", messageNote.getAlias_sendContent()); 112 + String content = messageNote.getAlias_sendContent();
  113 + WildcardQueryBuilder sendContentQuery = QueryBuilders.wildcardQuery("alias_sendContent", content.matches(".*[a-zA-z].*") ? content.toLowerCase() : content);
113 boolQueryBuilder.must(sendContentQuery); 114 boolQueryBuilder.must(sendContentQuery);
114 } 115 }
115 if (messageNote.getSendTimeBegin() != null && messageNote.getSendTimeEnd() != null) { 116 if (messageNote.getSendTimeBegin() != null && messageNote.getSendTimeEnd() != null) {