voip界面去掉无用的检索条件

摘要文件类型增加音视频文件类
ip和http增加配置导出

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -0,0 +1,162 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%> 
+<script type="text/javascript">
+$(function(){
+	//console.log("调用须知：调用本页面函数在common.js里，并且需要配置字典MAAT_SERVICE中的项")
+});
+</script>
+<div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
+	<form id="importForm1" action="${ctx}/ntc/iplist/import" method="post" enctype="multipart/form-data" class="form-horizontal"
+		onsubmit="loading('<spring:message code='loading'/>');">
+		
+		<div class="modal-dialog" role="document" style="width:700px;">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title" id="exampleModalLabel">
+						<spring:message code="import" />
+					</h5>
+					<button type="button" class="close" data-dismiss="modal"
+						aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+					<div class="alert alert-error hide">
+						<button class="close" data-dismiss="alert"></button>
+						<span></span>
+					</div>
+						<div class="form-group">
+							<label class="control-label col-md-3"> <spring:message
+									code="action" />
+							</label>
+							<div class="col-md-6">
+								<c:forEach items="${serviceList}" var="service"
+									varStatus="satus">
+									<label class="radio-inline">
+										<c:if test="${cfg.functionId eq service.functionId}">
+											<c:forEach items="${fns:getDictList('MAAT_SERVICE')}" var="serviceC">
+												<c:if test="${service.serviceId==serviceC.itemCode}">
+													<span class="${serviceC.itemValue}">
+														<input type="radio" name="serviceDictId" <c:if test="${serviceList.size() eq 1}">checked</c:if>
+															serviceId="${service.serviceId }" 
+															functionId="${service.functionId }"
+															cfgRegionCodeS="${service.regionCode }"
+															protocolId="${service.protocolId }"
+															action="${service.action }"
+															value="${service.dictId }" class="required action">
+														<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+															<c:if test="${dict.itemCode eq service.action}">
+																<spring:message code="${dict.itemValue }"/>
+															</c:if>
+														</c:forEach>
+													</span>
+												</c:if>
+		               						</c:forEach>
+										</c:if>
+									</label>
+								</c:forEach>
+							</div>
+							<div for="action"></div>
+						</div>
+						<div class="form-group">
+							<label class="control-label col-md-3"> <spring:message
+									code="cfg_type" />
+							</label>
+							<div class="col-md-6">
+								<c:forEach items="${regionList}" var="region"
+										varStatus="satus">
+									<label class="radio-inline">
+											<c:if test="${cfg.functionId eq region.functionId}">
+												<span>
+													<input type="radio" name="regionDictIds" class="required" 
+															value="${region.dictId }"
+															regionValue="${region.configRegionValue }"
+															regionType="${region.regionType }" 
+															isMaat="${region.isMaat }"
+															cfgRegionCodeR="${region.configRegionCode }"
+															configServiceType="${region.configServiceType }"
+															configMultiKeywords="${region.configMultiKeywords }"
+															configHex="${region.configHex }"
+															configIpPortShow="${region.configIpPortShow}"
+												   			configIpType="${region.configIpType}"
+												   			configIpPattern="${region.configIpPattern}"
+												   			configPortPattern="${region.configPortPattern}"
+												   			configDirection="${region.configDirection}"
+												   			configProtocol="${region.configProtocol}"
+												   			<c:if test="${regionList.size() eq 1}">checked</c:if>
+														>
+															<spring:message code="${region.configRegionValue }"/>
+												</span>
+											</c:if>
+									</label>
+								</c:forEach>
+							</div>
+							<div for="action"></div>
+						</div>
+						<div class="row">
+					           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
+					           <div class="col-md-6">
+					               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+					               		<option value=""><spring:message code="select"/></option>
+					               	<c:forEach items="${requestInfos}" var="requestInfo" varStatus="status">
+					               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
+					               			<option value="${requestInfo.id}" 
+					               		 	<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
+					               		</c:if>
+					               	</c:forEach>
+					               </select>
+					           </div>
+					           <div for="requestId"></div>
+						</div>
+						</br>
+						<div class="col-md-12">
+							<div class="form-group">
+								<label class="col-md-2 control-label" style="margin-top:5px;"><spring:message
+										code="chooseFile" />：</label>
+								<div class="controls">
+
+									<div class="fileupload fileupload-new"
+										data-provides="fileupload">
+
+										<div class="input-append">
+
+											<div class="uneditable-input">
+												<i class="fa fa-fa fa-file"></i> <span
+													class="fileupload-preview"></span>
+											</div>
+											<span class="btn btn-file ">
+												<button type="button" class="btn fileupload-new">
+													<spring:message code="add" />
+												</button>
+												<button type="button" class="btn fileupload-exists">
+													<spring:message code="edit" />
+												</button> <input type="file" class="default" id="uploadFile"
+												name="files" /> <input type="hidden" name="flag"
+												value="${flag }" />
+											</span>
+											<button type="button" class="btn red fileupload-exists"
+												data-dismiss="fileupload" style="margin-left:-1px;">
+												<spring:message code="remove" />
+												</a>
+												<button type="button" onclick="downLoadTemplate('${ctx}')"
+													class="btn black" style="margin-left:-1px">
+													<spring:message code="download" />
+												</button>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn red" onclick="importCfg()">
+						<spring:message code="ok" />
+					</button>
+					<button type="button" class="btn" data-dismiss="modal">
+						<spring:message code="close" />
+					</button>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>

src/main/webapp/WEB-INF/include/header.jsp

@@ -92,6 +92,8 @@
 	<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js"></script>
 	</c:otherwise>
 </c:choose>
+<script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
+
 <script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/jquery.tagsinput.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -2,6 +2,7 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <%@ attribute name="id" type="java.lang.String" required="true"%>
 <%@ attribute name="url" type="java.lang.String" required="true"%>
+<%@ attribute name="searchUrl" type="java.lang.String" required="false"%>
 <%@ attribute name="label" type="java.lang.String" required="false"%>
 <%@ attribute name="maxRow" type="java.lang.Long" required="false"%>
 <c:choose>
@@ -25,7 +26,7 @@
 		<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
 	</c:when>
 	<c:when test="${label eq 'export'}">
-		<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${maxRow })" data-toggle="tooltip" data-placement="top">
+		<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',100000,'${searchUrl}')" data-toggle="tooltip" data-placement="top">
 			<i class="fa fa-download"> <spring:message code="export"/></i>
 		</a>
 	</c:when>
@@ -250,12 +251,12 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 		});
 		return flag;
 	}
-	//删除
-	function exportData(url,maxRow){
+	//导出
+	function exportData(url,maxRow,searchUrl){
 		var column=[];
 		$("#${id} ${value} thead tr th").each(function(){
-			if($(this).attr("exportColumn")){
-				column.push($(this).attr("exportColumn"));
+			if($(this).is(":visible")){
+				column.push($(this).text().trim());
 			}
 		});
 		if(column){
@@ -280,6 +281,7 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 				$("#searchForm").attr("action",url);
 				$("#searchForm").submit();
 				closeTip();
+				$("#searchForm").attr("action",searchUrl);
 			}
 		}
 	}

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -154,11 +154,10 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
-												<form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
-												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
-												<form:option value="voipAccount.cfgKeywords"><spring:message code="av_voip_account_control"/></form:option>
+												<%--<form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>-->											<form:option value="voipAccount.cfgKeywords"><spring:message code="av_voip_account_control"/></form:option>--%>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
-												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
+												<%--<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>--%>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -143,7 +143,10 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="${service.serviceName}"/></form:option>
+														<c:if test="${service.serviceId ne 37 && service.serviceId ne 149}">
+															<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+														</c:if>
+														
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
@@ -163,6 +166,7 @@
 							 		<shiro:hasPermission name="iplist:config">
 							 			<sys:delRow url="${ctx}/ntc/iplist/form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/iplist/updateValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                        <%-- <sys:delRow url="${ctx}/ntc/iplist/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/iplist/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="iplist:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -326,6 +326,7 @@
 							 		<shiro:hasPermission name="website:http:config">
 							 			<sys:delRow url="${ctx}/ntc/website/httpForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/website/updateHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                        <%-- <sys:delRow url="${ctx}/ntc/website/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${ctx}/ntc/website/httpList?functionId=${cfg.functionId}" label="export"></sys:delRow> --%>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="website:http:confirm">
 	                                    <div class="btn-group">
@@ -336,7 +337,7 @@
 	                                        <ul class="dropdown-menu pull-right">
 	                                            <li><sys:delRow url="${ctx}/ntc/website/auditHttpCfg?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
 												<li><sys:delRow url="${ctx}/ntc/website/auditHttpCfg?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/ntc/website/auditHttpCfg?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
+												<li><sys:delRow url="${ctx}/ntc/website/auditHttpCfg?isAudit=3&isValid=0&functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/website/httpList?functionId=${cfg.functionId}" maxRow="10000" id="contentTable" label="cancelPass"></sys:delRow></li>            
 				                            </ul>
 				                         </div>
                                     </shiro:hasPermission>

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

@@ -52,11 +52,11 @@
 									<form:option value=""><spring:message code="action"/></form:option>
 									<c:forEach items="${serviceList}" var="service"
 											varStatus="satus">
-										<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> --%>
-											<c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96)}">  
-												<form:option value="${service.serviceId}"><spring:message code="${service.serviceName}"/></form:option>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) && (service.serviceId ne 37)&& (service.serviceId ne 149)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
-										<%-- </c:forEach> --%>
+										</c:forEach>
 									</c:forEach>
 								</form:select>
 							</div>

src/main/webapp/WEB-INF/views/report/list.jsp

@@ -365,24 +365,14 @@ function customColumnClick(){
 		<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action"> --%>
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
 				<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
-				    <c:if test="${service.serviceId ne 5}">
-				      <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}" >
+				      <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96) && (service.serviceId ne 37) && (service.serviceId ne 149)}" >
 					    <div data-service="${service.serviceId}" class="service btn">
 							<spring:message code="${service.serviceName}"/>
-							<spring:message code="log_total"/>
+							<%-- <spring:message code="log_total"/> --%>
 							<span>0</span>
 						</div>
 					</c:if>
-				    </c:if>
-					 <c:if test="${service.serviceId eq 5}">
-					   <c:if test="${(service.action ne 128) && (service.action ne 96)}" >
-					    <div data-service="${service.serviceId}" class="service btn">
-							<spring:message code="${service.serviceName}"/>
-							<spring:message code="log_total"/>
-							<span>0</span>
-						 </div>
-						</c:if>
-				    </c:if>
+				    
 				<%-- </c:if> --%>
 			</c:forEach>
 		<%-- </c:forEach> --%>

src/main/webapp/static/pages/scripts/importExcel.js

@@ -0,0 +1,29 @@
+$(function(){
+	//打开导入modal
+	$(".import").click(function(){
+		$("#import_modal").modal({
+			backdrop:"static",
+			keyboard:false,
+			show:true
+		});
+	});
+	$("input[name='serviceDictId']").click(function(){
+	});
+	$("input[name='regionDictIds']").click(function(){
+	});
+});
+
+/**
+ * 模板下载
+ * TODO 后期修改为传入regionDictId
+ * */
+function downLoadTemplate(path){
+	var obj={
+				"regionDictId":$("input[name='regionDictIds']:checked").val()
+				,"serviceDictId":$("input[name='serviceDictId']:checked").val()
+				,"requestId":$("select[name='requestId']").val()
+			};
+	var params = $.param(obj); 
+	document.location.href = path+'/ntc/iplist/import/template?' + params;
+	
+}