Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/domain/log/MmSampleAudioLog.java

@@ -0,0 +1,62 @@
+package com.nis.domain.log;
+
+public class MmSampleAudioLog extends BaseLogEntity<MmSampleAudioLog>{
+
+	private static final long serialVersionUID = -9107324545841909071L;
+	
+	private String pid;// 节目ID
+	private String url;// 节目访问地址
+	private String logUri;// fd现场片段路径
+	private String refer;// 入口页面
+	private Integer level;// 有害级别
+	private Integer fdType;// fd类型
+	private String protocol;// 传输协议
+	
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+	@Override
+	public String toString() {
+		return "MmSampleAudioLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
+				+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
+	}
+}

src/main/java/com/nis/domain/log/MmSamplePicLog.java

@@ -0,0 +1,62 @@
+package com.nis.domain.log;
+
+public class MmSamplePicLog extends BaseLogEntity<MmSamplePicLog>{
+
+	private static final long serialVersionUID = -8851111472033278357L;
+	
+	private String pid;// 节目ID
+	private String url;// 节目访问地址
+	private String logUri;// fd现场片段路径
+	private String refer;// 入口页面
+	private Integer level;// 有害级别
+	private Integer fdType;// fd类型
+	private String protocol;// 传输协议
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+	@Override
+	public String toString() {
+		return "MmSamplePicLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
+				+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
+	}
+	
+}

src/main/java/com/nis/domain/log/MmSampleVideoLog.java

@@ -0,0 +1,62 @@
+package com.nis.domain.log;
+
+public class MmSampleVideoLog extends BaseLogEntity<MmSampleVideoLog>{
+
+	private static final long serialVersionUID = -1160853324359310439L;
+	
+	private String pid;// 节目ID
+	private String url;// 节目访问地址
+	private String logUri;// fd现场片段路径
+	private String refer;// 入口页面
+	private Integer level;// 有害级别
+	private Integer fdType;// fd类型
+	private String protocol;// 传输协议
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getRefer() {
+		return refer;
+	}
+	public void setRefer(String refer) {
+		this.refer = refer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+	@Override
+	public String toString() {
+		return "MmSampleVideoLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
+				+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
+	}
+	
+}

src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java

@@ -0,0 +1,65 @@
+package com.nis.web.controller.log.ntc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.MmSampleAudioLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/mmSampleAudioLogs")
+public class MmSampleAudioController extends BaseController{
+	
+	@RequestMapping(value = {"/list",""})
+	public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSampleAudioLog sampleAudioLog) {
+		
+		PageLog<MmSampleAudioLog> page = new PageLog<MmSampleAudioLog>(request,response);
+		Map<String, Object> params = new HashMap<String,Object>();
+		params.put("pageSize", page.getPageSize());
+		params.put("pageNo", page.getPageNo());
+		
+		// 请求参数判断
+		initLogSearchValue(sampleAudioLog, params);
+		
+		try {
+			// 请求接口
+			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEAUDIO_LOG;
+			String resJson = HttpClientUtil.getMsg(url, params, request);
+			Gson gson = new GsonBuilder().create();
+			LogRecvData<MmSampleAudioLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleAudioLog>>() {}.getType());
+			if(fromJson.getStatus().intValue() == 200) {
+				Page<MmSampleAudioLog> fromPage = fromJson.getData();
+				page.setList(fromPage.getList());
+				List<MmSampleAudioLog> list = fromPage.getList();
+				for (MmSampleAudioLog log : list) {
+					log.setFunctionId(sampleAudioLog.getFunctionId());
+					setLogAction(log);
+				}
+				model.addAttribute("page", page);
+				logger.info("音频样例日志查询成功！");
+			}
+		} catch (Exception e) {
+			logger.info("音频样例日志查询失败！", e);
+			addMessage(model, e.getMessage());
+		}
+		
+		return "/log/ntc/mmSampleAudioList";
+	}
+}

src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java

@@ -0,0 +1,65 @@
+package com.nis.web.controller.log.ntc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.MmSamplePicLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/mmSamplePicLogs")
+public class MmSamplePicController extends BaseController{
+	
+	@RequestMapping(value = {"/list",""})
+	public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSamplePicLog samplePicLog) {
+		
+		PageLog<MmSamplePicLog> page = new PageLog<MmSamplePicLog>(request,response);
+		Map<String, Object> params = new HashMap<String,Object>();
+		params.put("pageSize", page.getPageSize());
+		params.put("pageNo", page.getPageNo());
+		
+		// 请求参数判断
+		initLogSearchValue(samplePicLog, params);
+		
+		try {
+			// 请求接口
+			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEPIC_LOG;
+			String resJson = HttpClientUtil.getMsg(url, params, request);
+			Gson gson = new GsonBuilder().create();
+			LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
+			if(fromJson.getStatus().intValue() == 200) {
+				Page<MmSamplePicLog> fromPage = fromJson.getData();
+				page.setList(fromPage.getList());
+				List<MmSamplePicLog> list = fromPage.getList();
+				for (MmSamplePicLog log : list) {
+					log.setFunctionId(samplePicLog.getFunctionId());
+					setLogAction(log);
+				}
+				model.addAttribute("page", page);
+				logger.info("图片样例日志查询成功！");
+			}
+		} catch (Exception e) {
+			logger.info("图片样例日志查询失败！", e);
+			addMessage(model, e.getMessage());
+		}
+		
+		return "/log/ntc/mmSamplePicList";
+	}
+}

src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java

@@ -0,0 +1,65 @@
+package com.nis.web.controller.log.ntc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.MmSampleVideoLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/mmSampleVideoLogs")
+public class MmSampleVideoController extends BaseController{
+	
+	@RequestMapping(value = {"/list",""})
+	public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSampleVideoLog sampleVideoLog) {
+		
+		PageLog<MmSampleVideoLog> page = new PageLog<MmSampleVideoLog>(request,response);
+		Map<String, Object> params = new HashMap<String,Object>();
+		params.put("pageSize", page.getPageSize());
+		params.put("pageNo", page.getPageNo());
+		
+		// 请求参数判断
+		initLogSearchValue(sampleVideoLog, params);
+		
+		try {
+			// 请求接口
+			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEVIDEO_LOG;
+			String resJson = HttpClientUtil.getMsg(url, params, request);
+			Gson gson = new GsonBuilder().create();
+			LogRecvData<MmSampleVideoLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleVideoLog>>() {}.getType());
+			if(fromJson.getStatus().intValue() == 200) {
+				Page<MmSampleVideoLog> fromPage = fromJson.getData();
+				page.setList(fromPage.getList());
+				List<MmSampleVideoLog> list = fromPage.getList();
+				for (MmSampleVideoLog log : list) {
+					log.setFunctionId(sampleVideoLog.getFunctionId());
+					setLogAction(log);
+				}
+				model.addAttribute("page", page);
+				logger.info("视频样例日志查询成功！");
+			}
+		} catch (Exception e) {
+			logger.info("视频样例日志查询失败！", e);
+			addMessage(model, e.getMessage());
+		}
+		
+		return "/log/ntc/mmSampleVideoList";
+	}
+}

src/main/resources/messages/message_ru.properties

@@ -627,6 +627,8 @@ direct=direction
 stream_type=stream type
 clj_ip=processor ip
 nest_addr_list=nest addr list
+server_locate=server locate
+client_locate=client locate
 user_region=user region
 version=version
 encrypt_mode=encrypt mode

src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp

@@ -215,7 +215,11 @@ $(document).ready(function(){
 									<td>${log.logUri}</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
-									<td>${log.fdType}</td>
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
 									<td>${log.protocol}</td>
 									
 									<td>${log.foundTime}</td>

src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp

@@ -170,7 +170,6 @@ $(document).ready(function(){
 									<th><spring:message code='entrance_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='direct'/></th>
-									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
@@ -178,7 +177,6 @@ $(document).ready(function(){
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 									<th><spring:message code='av_protocol'/></th>
-									
 									<th><spring:message code='found_time'/></th>
 									<th><spring:message code='recv_time'/></th>
 									<th><spring:message code='protocol'/></th>
@@ -209,15 +207,17 @@ $(document).ready(function(){
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									
 									<td>${log.pid}</td>
 									<td>${log.url}</td>
 									<td>${log.logUri}</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
-									<td>${log.fdType}</td>
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
 									<td>${log.protocol}</td>
-									
 									<td>${log.foundTime}</td>
 									<td>${log.recvTime}</td>
 									<td>${log.transProto}</td>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp

@@ -0,0 +1,254 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//筛选功能
+	filterActionInit();
+	//reset
+	$("#resetBtn").on("click",function(){
+		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$(':input','#searchForm')
+		.not(':button,:submit,:reset,:hidden')
+		.attr("value",'');
+		$("#searchForm")[0].reset();
+	});
+	
+});
+//查询
+	function page(n,s){
+	$("#intype").attr("name",$("#seltype").val());
+	$("#pageNo").val(n);
+	$("#pageSize").val(s);
+	$("#searchForm").attr("action","${ctx}/log/ntc/mmSampleAudioLogs");
+	$("#searchForm").submit();
+	loading();
+	return false;
+}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<h3 class="page-title">
+		<spring:message code="av_sample_audio_control"/>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmSampleAudioLogs" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
+										<form:option value="16"><spring:message code="action_reject"/></form:option>
+										<form:option value="1"><spring:message code="action_monit"/></form:option>
+									</form:select>
+								</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+	                               
+	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                    </div>
+							</div>
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+										<label><spring:message code="protocol_type"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direct"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+	                                        <label><spring:message code="clj_ip"/>：</label>
+	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                    </div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
+								</div>
+							</div>
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div> 
+
+					<div class="table-responsive">
+					<sys:message content="${message}"/>
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><spring:message code='cfg_id'/></th>
+									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code="action"/></th>
+									<th><spring:message code='direct'/></th>
+									<th><spring:message code='pid'/></th>
+									<th><spring:message code='access_url'/></th>
+									<th><spring:message code='log_uri'/></th>
+									<th><spring:message code='refer'/></th>
+									<th><spring:message code='harm_level'/></th>
+									<th><spring:message code='fd_type'/></th>
+									<th><spring:message code='av_protocol'/></th>
+									<th><spring:message code='found_time'/></th>
+									<th><spring:message code='recv_time'/></th>
+									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='serverip'/></th>
+									<th><spring:message code='clientip'/></th>
+									<th><spring:message code='serverport'/></th>
+									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='deviceid'/></th>
+									<th><spring:message code='stream_type'/></th>
+									<th><spring:message code='clj_ip'/></th>
+									<th><spring:message code='nest_addr_list'/></th>
+									<th><spring:message code='user_region'/></th>
+									
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
+								<tr>
+									<td>${log.cfgId}</td> 
+									<td>${log.entranceId}</td>
+									<td>
+										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
+										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.pid}</td>
+									<td>${log.url}</td>
+									<td>${log.logUri}</td>
+									<td>${log.refer}</td>
+									<td>${log.level}</td>
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
+									<td>${log.protocol}</td>
+									<td>${log.foundTime}</td>
+									<td>${log.recvTime}</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>${log.dIp}</td>
+									<td>${log.sIp}</td>
+									<td>${log.dPort}</td>
+									<td>${log.sPort}</td>
+									<td>${log.deviceId}</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>
+									</td>
+									<td>${log.capIp}</td>
+									<td>${log.addrList}</td>
+									<td>${log.userRegion}</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp

@@ -0,0 +1,254 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//筛选功能
+	filterActionInit();
+	//reset
+	$("#resetBtn").on("click",function(){
+		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$(':input','#searchForm')
+		.not(':button,:submit,:reset,:hidden')
+		.attr("value",'');
+		$("#searchForm")[0].reset();
+	});
+	
+});
+//查询
+	function page(n,s){
+	$("#intype").attr("name",$("#seltype").val());
+	$("#pageNo").val(n);
+	$("#pageSize").val(s);
+	$("#searchForm").attr("action","${ctx}/log/ntc/mmSamplePicLogs");
+	$("#searchForm").submit();
+	loading();
+	return false;
+}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<h3 class="page-title">
+		<spring:message code="av_sample_picture_control"/>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmSamplePicLogs" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
+										<form:option value="16"><spring:message code="action_reject"/></form:option>
+										<form:option value="1"><spring:message code="action_monit"/></form:option>
+									</form:select>
+								</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+	                               
+	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                    </div>
+							</div>
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+										<label><spring:message code="protocol_type"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direct"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+	                                        <label><spring:message code="clj_ip"/>：</label>
+	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                    </div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
+								</div>
+							</div>
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div> 
+
+					<div class="table-responsive">
+					<sys:message content="${message}"/>
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><spring:message code='cfg_id'/></th>
+									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code="action"/></th>
+									<th><spring:message code='direct'/></th>
+									<th><spring:message code='pid'/></th>
+									<th><spring:message code='access_url'/></th>
+									<th><spring:message code='log_uri'/></th>
+									<th><spring:message code='refer'/></th>
+									<th><spring:message code='harm_level'/></th>
+									<th><spring:message code='fd_type'/></th>
+									<th><spring:message code='av_protocol'/></th>
+									<th><spring:message code='found_time'/></th>
+									<th><spring:message code='recv_time'/></th>
+									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='serverip'/></th>
+									<th><spring:message code='clientip'/></th>
+									<th><spring:message code='serverport'/></th>
+									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='deviceid'/></th>
+									<th><spring:message code='stream_type'/></th>
+									<th><spring:message code='clj_ip'/></th>
+									<th><spring:message code='nest_addr_list'/></th>
+									<th><spring:message code='user_region'/></th>
+									
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
+								<tr>
+									<td>${log.cfgId}</td> 
+									<td>${log.entranceId}</td>
+									<td>
+										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
+										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.pid}</td>
+									<td>${log.url}</td>
+									<td>${log.logUri}</td>
+									<td>${log.refer}</td>
+									<td>${log.level}</td>
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
+									<td>${log.protocol}</td>
+									<td>${log.foundTime}</td>
+									<td>${log.recvTime}</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>${log.dIp}</td>
+									<td>${log.sIp}</td>
+									<td>${log.dPort}</td>
+									<td>${log.sPort}</td>
+									<td>${log.deviceId}</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>
+									</td>
+									<td>${log.capIp}</td>
+									<td>${log.addrList}</td>
+									<td>${log.userRegion}</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp

@@ -0,0 +1,255 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//筛选功能
+	filterActionInit();
+	//reset
+	$("#resetBtn").on("click",function(){
+		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$(':input','#searchForm')
+		.not(':button,:submit,:reset,:hidden')
+		.attr("value",'');
+		$("#searchForm")[0].reset();
+	});
+	
+});
+//查询
+	function page(n,s){
+	$("#intype").attr("name",$("#seltype").val());
+	$("#pageNo").val(n);
+	$("#pageSize").val(s);
+	$("#searchForm").attr("action","${ctx}/log/ntc/mmSampleVideoLogs");
+	$("#searchForm").submit();
+	loading();
+	return false;
+}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<h3 class="page-title">
+		<spring:message code="av_sample_vedio_control"/>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmSampleVideoLogs" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
+										<form:option value="16"><spring:message code="action_reject"/></form:option>
+										<form:option value="1"><spring:message code="action_monit"/></form:option>
+									</form:select>
+								</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+	                               
+	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                    </div>
+							</div>
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+										<label><spring:message code="protocol_type"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direct"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+	                                        <label><spring:message code="clj_ip"/>：</label>
+	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                    </div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
+								</div>
+							</div>
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div> 
+
+					<div class="table-responsive">
+					<sys:message content="${message}"/>
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><spring:message code='cfg_id'/></th>
+									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code="action"/></th>
+									<th><spring:message code='direct'/></th>
+									<th><spring:message code='pid'/></th>
+									<th><spring:message code='access_url'/></th>
+									<th><spring:message code='log_uri'/></th>
+									<th><spring:message code='refer'/></th>
+									<th><spring:message code='harm_level'/></th>
+									<th><spring:message code='fd_type'/></th>
+									<th><spring:message code='av_protocol'/></th>
+									<th><spring:message code='found_time'/></th>
+									<th><spring:message code='recv_time'/></th>
+									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='serverip'/></th>
+									<th><spring:message code='clientip'/></th>
+									<th><spring:message code='serverport'/></th>
+									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='deviceid'/></th>
+									<th><spring:message code='stream_type'/></th>
+									<th><spring:message code='clj_ip'/></th>
+									<th><spring:message code='nest_addr_list'/></th>
+									<th><spring:message code='user_region'/></th>
+									
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
+								<tr>
+									<td>${log.cfgId}</td> 
+									<td>${log.entranceId}</td>
+									<td>
+										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
+										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.pid}</td>
+									<td>${log.url}</td>
+									<td>${log.logUri}</td>
+									<td>${log.refer}</td>
+									<td>${log.level}</td>
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
+									<td>${log.protocol}</td>
+									
+									<td>${log.foundTime}</td>
+									<td>${log.recvTime}</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>${log.dIp}</td>
+									<td>${log.sIp}</td>
+									<td>${log.dPort}</td>
+									<td>${log.sPort}</td>
+									<td>${log.deviceId}</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>
+									</td>
+									<td>${log.capIp}</td>
+									<td>${log.addrList}</td>
+									<td>${log.userRegion}</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+	</div>
+</body>
+</html>