From 653b56f5c6670a7f0835e42103a879b28ad5f325 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 16:55:34 +0800
Subject: [PATCH] =?UTF-8?q?bgp=E6=97=A5=E5=BF=97type=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90=E5=AD=97=E5=85=B8=E5=8F=96=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?as=E5=AD=97=E6=AE=B5=E6=8D=A2=E6=88=90asNum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/NtcBGPLog.java        | 10 +++++-----
 .../resources/sql/20181010/add_bgp_message_type.sql    |  2 ++
 src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp      |  8 ++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/sql/20181010/add_bgp_message_type.sql

diff --git a/src/main/java/com/nis/domain/log/NtcBGPLog.java b/src/main/java/com/nis/domain/log/NtcBGPLog.java
index 785d76219..64a1ac784 100644
--- a/src/main/java/com/nis/domain/log/NtcBGPLog.java
+++ b/src/main/java/com/nis/domain/log/NtcBGPLog.java
@@ -4,7 +4,7 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
 
 	private static final long serialVersionUID = 4597407682545926823L;
 	private Integer type;
-	private String as;
+	private String asNum;
 	private String route;
 	public Integer getType() {
 		return type;
@@ -12,11 +12,11 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
 	public void setType(Integer type) {
 		this.type = type;
 	}
-	public String getAs() {
-		return as;
+	public String getAsNum() {
+		return asNum;
 	}
-	public void setAs(String as) {
-		this.as = as;
+	public void setAsNum(String asNum) {
+		this.asNum = asNum;
 	}
 	public String getRoute() {
 		return route;
diff --git a/src/main/resources/sql/20181010/add_bgp_message_type.sql b/src/main/resources/sql/20181010/add_bgp_message_type.sql
new file mode 100644
index 000000000..7d17405e2
--- /dev/null
+++ b/src/main/resources/sql/20181010/add_bgp_message_type.sql
@@ -0,0 +1,2 @@
+INSERT INTO sys_data_dictionary_name (`id`,`module_name`,`mark`,`remark`,`revision`,`create_time`,`modify_time`,`status`) VALUES(115,'BGP消息类型','BGP_MESSAGE_TYPE','','','2018-10-10 16:28:05','2018-10-10 16:28:05',1);
+insert into sys_data_dictionary_item (`id`,`item_code`,`item_value`,`item_desc`,`item_sort`,`status`,`type`,`dictionary_id`) values (2602,1,'open','',0,1,1,115),(2603,2,'keepalive','',0,1,1,115),(2604,3,'update','',0,1,1,115),(2605,4,'notification','',0,1,1,115)
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index 87018298a..5112cc9df 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -248,8 +248,12 @@
 									<td>${log.dAsn}</td>
 									<td>${log.sSubscribeId}</td>
 									<td>${log.dSubscribeId}</td>
-									<td>${log.type}</td>
-									<td>${log.as}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('BGP_MESSAGE_TYPE')}" var="type">
+											<c:if test="${type.itemCode eq log.type}">${type.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>${log.asNum}</td>
 									<td>${log.route}</td>
 								</tr>
 							</c:forEach>