From 433b6df3a41d33754fab9e1ac538ebf2c1e9cc5a Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Mon, 5 Nov 2018 10:35:55 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manipulation/DkBehaviorLogController.java |   4 -
 .../views/log/manipulation/dkBehaviorList.jsp | 173 +++++++++---------
 2 files changed, 85 insertions(+), 92 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
index af57149ac..679ee7821 100644
--- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
+++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
@@ -66,13 +66,9 @@ public class DkBehaviorLogController extends BaseController{
 			
 			//获取字典信息
 			List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
-			List<CodeResult> osList=CodeDicUtils.getCodeList("osCode");
-			List<CodeResult> browserList=CodeDicUtils.getCodeList("browserCode");
 			List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
 			List<CodeResult> appList=CodeDicUtils.getCodeList("appCode");
 			model.addAttribute("protocolList", protocolList);
-			model.addAttribute("osList", osList);
-			model.addAttribute("browserList", browserList);
 			model.addAttribute("behaviorList", behaviorList);
 			model.addAttribute("appList", appList);
 			String url = "";
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 695932f43..04fa1a88d 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -176,50 +176,52 @@ $(document).ready(function(){
 				<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
-							<thead>
+						<thead>
+							<tr>
+								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
+								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
+								<th class="sort-column found_time"><spring:message code="found_time"/></th>
+								<th class="sort-column recv_time" isVisible="false"><spring:message code="recv_time"/></th>
+								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
+								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
+								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
+								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>
+								<th class="sort-column d_port"><spring:message code="server_port"/></th>
+								<th class="sort-column s_port"><spring:message code="client_port"/></th>
+								<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>
+								
+								<th class="sort-column label_proto_id"><spring:message code='basic_protocol'/></th>
+								<th class="sort-column label_proto_source" isVisible="false"><spring:message code='label_proto_source'/></th>
+								<th class="sort-column label_behav_id"><spring:message code='behaviour_type'/></th>
+								<th class="sort-column label_behav_source" isVisible="false"><spring:message code='label_behav_source'/></th> 
+								<th class="sort-column label_app_id"><spring:message code='social_app'/></th>
+								<th class="sort-column label_app_source" isVisible="false"><spring:message code='label_app_source'/></th> 
+								
+								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
+								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
+								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
+								<th class="sort-column direction"><spring:message code="direction"/></th>
+								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
+								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
+								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
+								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
+								<th class="sort-column nest_addr_list"><spring:message code="nest_addr_list"/></th>
+								<th class="sort-column server_locate"><spring:message code='server_locate'/></th>
+								<th class="sort-column client_locate"><spring:message code='client_locate'/></th>
+								<th class="sort-column s_asn" isVisible="false"><spring:message code='s_asn'/></th>
+								<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
+								<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
+								<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
+								<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
+								<th class="sort-column scene_file"><spring:message code='scene_file'/></th>
+							</tr>
+						</thead>
+						<tbody>
+							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
-									<th class="sort-column cfg_id"><spring:message code="cfg_id"/></th>
-									<th class="sort-column service"><spring:message code="action"/></th>
-									<th class="sort-column found_time"><spring:message code="found_time"/></th>
-									<th class="sort-column entrance_id"><spring:message code="entrance"/></th>
-									
-									<th class="sort-column label_proto_id"><spring:message code='basic_protocol'/></th>
-									<%-- <th class="sort-column label_proto_source"><spring:message code='label_proto_source'/></th> --%>
-									<th><spring:message code='os_type'/></th>
-									<th><spring:message code='browser_type'/></th>
-									<th class="sort-column label_behav_id"><spring:message code='behaviour_type'/></th>
-									<%-- <th class="sort-column label_behav_source"><spring:message code='label_behav_source'/></th> --%>
-									<th class="sort-column label_app_id"><spring:message code='social_app'/></th>
-									<%-- <th class="sort-column label_app_source"><spring:message code='label_app_source'/></th> --%>
-									<th class="sort-column c2s_pkt_num"><spring:message code='c2s_pkt_num'/></th>
-									<th class="sort-column s2c_pkt_num"><spring:message code='s2c_pkt_num'/></th>
-									<th class="sort-column c2s_byte_num"><spring:message code='c2s_byte_num'/></th>
-									<th class="sort-column s2c_byte_num"><spring:message code='s2c_byte_num'/></th> 
-									
-									<th class="sort-column cap_ip"><spring:message code="clj_ip"/></th>
-									<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
-									<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
-									<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
-									<th class="sort-column s_ip"><spring:message code="client_ip"/></th>
-									<th class="sort-column d_port"><spring:message code="server_port"/></th>
-									<th class="sort-column s_port"><spring:message code="client_port"/></th>
-									<th class="sort-column device_id"><spring:message code="deviceid"/></th>
-									<th class="sort-column direction"><spring:message code="direction"/></th>
-									<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
-<%-- 									<th><spring:message code='nest_addr_list'/></th> --%>
-									<th class="sort-column server_locate"><spring:message code='server_locate'/></th>
-									<th class="sort-column client_locate"><spring:message code='client_locate'/></th>
-									<th class="sort-column s_asn"><spring:message code='s_asn'/></th>
-									<th class="sort-column d_asn"><spring:message code='d_asn'/></th>
-									<th class="sort-column s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
-									<th class="sort-column d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
-									<th class="sort-column scene_file"><spring:message code='scene_file'/></th>
-								</tr>
-							</thead> 
-							<tbody>
-							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
-								<tr>
-									<td>${log.cfgId } <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td> 
+									<td>${log.cfgId } 
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
 											<c:if test="${dict.itemCode eq log.action}">
@@ -227,11 +229,28 @@ $(document).ready(function(){
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>${log.foundTime}</td>
+									<td>${log.foundTime }</td>
+									<td>${log.recvTime }</td>
 									<td>
-										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
-											<c:if test="${dict.itemCode eq log.entranceId}">
-												<spring:message code="${dict.itemValue}"/>
+										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
+											<c:if test="${dic.itemCode eq log.transProto}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
+											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td>${log.dPort }</td>
+									<td>${log.sPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
 											</c:if>
 										</c:forEach>
 									</td>
@@ -246,20 +265,6 @@ $(document).ready(function(){
 									<td>
 												${log.labelProtoSource}
 									</td>
-									<%-- <td>
-										<c:forEach items="${osList}" var="dict">
-											<c:if test="${dict.code eq log.labelOsId}">
-												<spring:message code="${dict.item}"/>
-											</c:if>
-										</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${browserList}" var="dict">
-											<c:if test="${dict.code eq log.labelBsId}">
-												<spring:message code="${dict.item}"/>
-											</c:if>
-										</c:forEach>
-									</td> --%>
 									<td>
 										<c:forEach items="${behaviorList}" var="dict">
 											<c:if test="${dict.code eq log.labelBehavId}">
@@ -280,51 +285,43 @@ $(document).ready(function(){
 									<td>
 												${log.labelAppSource}
 									</td>
-									<%-- <td>${log.c2sPktNum}</td>
-									<td>${log.s2cPktNum}</td>
-									<td>${log.c2sByteNum}</td>
-									<td>${log.s2cByteNum}</td> --%>
-									
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
-									<td>${log.transProto}</td>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
-											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
-									<td>${log.dPort}</td>
-									<td>${log.sPort}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
+									<td>${log.linkId }</td>
 									<td>
-										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
-											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
-				               			</c:forEach>
+										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
+											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
+					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
-											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
-				               			</c:forEach>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
+					                	</c:forEach>
 									</td>
-									<%-- <td>
-										${log.addrList}
-									</td> --%>
+									<td>${log.innerSmac }</td>
+									<td>${log.innerDmac }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
+											<c:if test="${streamType.itemCode eq log.streamDir}">${streamType.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td>${log.addrList }</td>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 									<td>${log.sAsn}</td>
 									<td>${log.dAsn}</td>
 									<td>${log.sSubscribeId}</td>
 									<td>${log.dSubscribeId}</td>
+									<td>${log.userRegion}</td>
 									<td>${log.sceneFile}</td>
 								</tr>
 							</c:forEach>
-							</tbody>
-						</table>
+						</tbody>
+					</table>
 						<div class="page">${page}</div>
 					</div>
 			</div>