作者 朱兆平

总线es搜索

@@ -65,7 +65,7 @@ export const batchRemoveBusQueue = params =>{return http.get(`${baseUrl}/queue/b @@ -65,7 +65,7 @@ export const batchRemoveBusQueue = params =>{return http.get(`${baseUrl}/queue/b
65 65
66 66
67 // MQ消息收发记录,分页查询列表 67 // MQ消息收发记录,分页查询列表
68 -export const selectMessageNoteList = params =>{return http.get(`${baseUrl}/note/list`, params);}; 68 +export const selectMessageNoteList = params =>{return http.post(`${baseUrl}/es/search/wildmsg`, params);};
69 // MQ消息收发记录,新增 69 // MQ消息收发记录,新增
70 export const insertMessageNote = params =>{return http.post(`${baseUrl}/note/insert`, params);}; 70 export const insertMessageNote = params =>{return http.post(`${baseUrl}/note/insert`, params);};
71 // MQ消息收发记录,编辑 71 // MQ消息收发记录,编辑
@@ -17,31 +17,35 @@ @@ -17,31 +17,35 @@
17 </el-col> 17 </el-col>
18 </el-row> 18 </el-row>
19 </div> 19 </div>
20 - <div :index="item.id+''" v-for="item in messageNote_page.messageNoteList" :key="item.id" style="margin-left: 30px;margin-top: 30px"> 20 + <div :index="item.msgid+''" v-for="item in messageNote_page.messageNoteList" :key="item.msgid" style="margin-left: 30px;margin-top: 30px">
21 <el-row> 21 <el-row>
22 - <el-col :span="3"> 22 + <el-col :span="2">
  23 + <span>消息id:</span>
  24 + <el-tag>{{item.msgid}}</el-tag>
  25 + </el-col>
  26 + <el-col :span="1">
23 <span>发送人:</span> 27 <span>发送人:</span>
24 - <el-tag>{{item.username}}</el-tag> 28 + <el-tag>{{item.sndr}}</el-tag>
25 </el-col> 29 </el-col>
26 - <el-col :span="4">  
27 - <span>发送时间:</span>  
28 - <el-tag>{{item.alias_sendTime}}</el-tag> 30 + <el-col :span="1">
  31 + <span>消息大类:</span>
  32 + <el-tag type="success">{{item.btype}}</el-tag>
29 </el-col> 33 </el-col>
30 - <el-col :span="3">  
31 - <span>服务器:</span>  
32 - <el-tag type="success">{{item.serverName}}</el-tag> 34 + <el-col :span="1">
  35 + <span>消息子类:</span>
  36 + <el-tag type="success">{{item.stype}}</el-tag>
33 </el-col> 37 </el-col>
34 - <el-col :span="3">  
35 - <span>虚拟主机:</span>  
36 - <el-tag type="success">{{item.virtualHostName}}</el-tag> 38 + <el-col :span="4">
  39 + <span>发送时间:</span>
  40 + <el-tag>{{item.ddtm}}</el-tag>
37 </el-col> 41 </el-col>
38 <el-col :span="3"> 42 <el-col :span="3">
39 - <span>交换机:</span>  
40 - <el-tag type="danger">{{item.exchangeName}}</el-tag> 43 + <span>路由接收者:</span>
  44 + <el-tag type="danger">{{item.rcvrs}}</el-tag>
41 </el-col> 45 </el-col>
42 <el-col :span="3"> 46 <el-col :span="3">
43 - <span>路由键:</span>  
44 - <el-tag type="warning">{{item.routingKeyName}}</el-tag> 47 + <span>消息接收者:</span>
  48 + <el-tag type="warning">{{item.rcvlog}}</el-tag>
45 </el-col> 49 </el-col>
46 <el-col :span="2"> 50 <el-col :span="2">
47 <el-button type="primary" @click="messageNote_toViewContentDialogDialog(item)" size="small">查看内容 51 <el-button type="primary" @click="messageNote_toViewContentDialogDialog(item)" size="small">查看内容
@@ -50,7 +54,7 @@ @@ -50,7 +54,7 @@
50 </el-row> 54 </el-row>
51 <el-row> 55 <el-row>
52 <el-col style="width: 90%" :span="22"> 56 <el-col style="width: 90%" :span="22">
53 - <el-input v-model="item.alias_sendContent" readonly type="textarea" :rows="3"></el-input> 57 + <el-input v-model="item.msg" readonly type="textarea" :rows="3"></el-input>
54 </el-col> 58 </el-col>
55 </el-row> 59 </el-row>
56 <el-divider></el-divider> 60 <el-divider></el-divider>
@@ -64,9 +68,9 @@ @@ -64,9 +68,9 @@
64 @size-change="messageNote_handleSizeChange" 68 @size-change="messageNote_handleSizeChange"
65 @current-change="messageNote_handleCurrentChange" 69 @current-change="messageNote_handleCurrentChange"
66 :current-page="messageNote_queryInfo.pageNum" 70 :current-page="messageNote_queryInfo.pageNum"
67 - :page-sizes="[10,50,200,500]" 71 + :page-sizes="[2,10,50,200,500]"
68 :page-size="messageNote_queryInfo.pageSize" 72 :page-size="messageNote_queryInfo.pageSize"
69 - layout=" sizes, prev, pager, next, jumper" 73 + layout="total, sizes, prev, pager, next, jumper"
70 :total="messageNote_page.total"> 74 :total="messageNote_page.total">
71 </el-pagination> 75 </el-pagination>
72 </el-col> 76 </el-col>
@@ -82,7 +86,7 @@ @@ -82,7 +86,7 @@
82 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 86 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
83 :model="messageNote_viewContentForm" ref="messageNote_viewContentFormRef"> 87 :model="messageNote_viewContentForm" ref="messageNote_viewContentFormRef">
84 <el-form-item label="消息内容:" prop="alias_sendContent"> 88 <el-form-item label="消息内容:" prop="alias_sendContent">
85 - <el-input v-model="messageNote_viewContentForm.alias_sendContent" v-if="isViewContent === false" 89 + <el-input v-model="messageNote_viewContentForm.msg" v-if="isViewContent === false"
86 style="width:1000px" type="textarea" :rows="8"> 90 style="width:1000px" type="textarea" :rows="8">
87 </el-input> 91 </el-input>
88 <el-input v-model="xml_content" v-if="isViewContent === true" 92 <el-input v-model="xml_content" v-if="isViewContent === true"
@@ -92,7 +96,7 @@ @@ -92,7 +96,7 @@
92 </el-form> 96 </el-form>
93 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 97 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
94 98
95 - <el-button type="success" @click="xml_format(messageNote_viewContentForm.alias_sendContent)" size="medium" 99 + <el-button type="success" @click="xml_format(messageNote_viewContentForm.msg)" size="medium"
96 style="width: 100px">xml格式化 100 style="width: 100px">xml格式化
97 </el-button> 101 </el-button>
98 102
@@ -125,7 +129,7 @@ @@ -125,7 +129,7 @@
125 // 当前页数 129 // 当前页数
126 pageNum: 1, 130 pageNum: 1,
127 // 每页条数 131 // 每页条数
128 - pageSize: 10 132 + pageSize: 2
129 }, 133 },
130 /** 134 /**
131 * messageNote,分页 135 * messageNote,分页
@@ -185,26 +189,27 @@ @@ -185,26 +189,27 @@
185 * messageNote,分页查询 189 * messageNote,分页查询
186 */ 190 */
187 messageNote_getList() { 191 messageNote_getList() {
  192 + let _this = this;
188 // 开启加载 193 // 开启加载
189 this.messageNote_loading.listLoading = true; 194 this.messageNote_loading.listLoading = true;
190 selectMessageNoteList(this.messageNote_queryInfo).then((response) => { 195 selectMessageNoteList(this.messageNote_queryInfo).then((response) => {
191 let res = response.data; 196 let res = response.data;
192 if (res.code !== '200') { 197 if (res.code !== '200') {
193 // 关闭加载 198 // 关闭加载
194 - this.messageNote_loading.listLoading = false;  
195 - return this.$message.error('获取消息收发记录,失败!'); 199 + _this.messageNote_loading.listLoading = false;
  200 + return _this.$message.error('获取消息收发记录,失败!');
196 } 201 }
197 // 获取列表数据 202 // 获取列表数据
198 - this.messageNote_page.messageNoteList = res.data; 203 + _this.messageNote_page.messageNoteList = res.data.content;
199 // 获取列表的总记录数 204 // 获取列表的总记录数
200 - this.messageNote_page.total = res.total; 205 + _this.messageNote_page.total = res.data.totalElements;
201 // 关闭加载 206 // 关闭加载
202 - this.messageNote_loading.listLoading = false;  
203 - this.$message.success('获取消息收发记录,成功!'); 207 + _this.messageNote_loading.listLoading = false;
  208 + _this.$message.success('获取消息收发记录,成功!');
204 }).catch(error => { 209 }).catch(error => {
205 // 关闭加载 210 // 关闭加载
206 - this.messageNote_loading.listLoading = false;  
207 - this.$message.error(error.toString()); 211 + _this.messageNote_loading.listLoading = false;
  212 + _this.$message.error(error.toString());
208 }); 213 });
209 }, 214 },
210 /** 215 /**