APP策略、文件摘要加SubscribeId域.

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp

@@ -13,6 +13,11 @@ $(function(){
 		}else{
 			$("#ratelimit").hide();
 		}
+		if(($(".action:checked").val()==1) || ($(".action:checked").val()==16)){
+			$(".subscribeId").show();
+		}else{
+			$(".subscribeId").hide();
+		}
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -21,6 +26,11 @@ $(function(){
 	}else{
 		$("#ratelimit").hide();
 	}
+	if(($(".action:checked").val()==1) || ($(".action:checked").val()==16)){
+		$(".subscribeId").show();
+	}else{
+		$(".subscribeId").hide();
+	}
 	$("#cfgFrom").validate({
 		errorPlacement: function(error,element){
 			if($(element).parents().hasClass("tagsinput")){
@@ -31,6 +41,11 @@ $(function(){
 		},
 		submitHandler: function(form){
 			var flag = true;
+			//代表所有业务都隐藏了，提示必须增加一种业务数据
+			if($(".boxSolid").length ==$(".boxSolid.hidden").length){
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+			}
 			$("input[name$='cfgKeywords']").each(function(){
 				if($(this).val()==''){
 					$(this).parents(".form-group").find(
@@ -65,7 +80,6 @@ $(function(){
 				if($("input[name='ratelimit']").is(":hidden")){
 					$("input[name='ratelimit']").val("");
 				}
-				/* $("#appCode").val($("#specServiceIdId").val()); */
 				loading('onloading...');
 				form.submit();
 			}else{
@@ -175,8 +189,9 @@ var delContent = function(contentClassName, addBtnClassName) {
                           <!-- desc and action -->
                              
 							<c:set var="ipCfgIndex" value="0"></c:set>
+							<c:set var="subscribeIdCfgIndex" value="0"></c:set>
 							<c:forEach items="${regionList}" var="region" varStatus="status">
-								<c:if test="${region.regionType eq 2 }">
+								<c:if test="${region.configServiceType eq 'app_policy' }">
 									<input type="hidden" name="cfgType" value="${region.configRegionValue}">
                    					<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
                    					<div class="row">
@@ -273,6 +288,49 @@ var delContent = function(contentClassName, addBtnClassName) {
 										    
 									</div>
 								</c:if>
+								<!-- subscribeId配置 -->
+								<div class="subscribeId" >
+								<c:if test="${region.configServiceType eq 'subscribe_id'}">
+									<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+									<h4 class="form-section">
+										<spring:message code="${region.configRegionValue}" />
+										<small> <span
+											class="glyphicon glyphicon-plus ${tabName}Add"
+											onClick="addContent(this,'${tabName}')" title="add"></span></small>
+									</h4>
+									<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdCfgIndex}]"></c:set>
+									<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+									<c:choose>
+										<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0 and (!empty _cfg.ntcSubscribeIdCfgList[subscribeIdCfgIndex].cfgId)}">
+											<c:set var="isBreak" value="false" ></c:set>
+											<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+												<c:choose>
+													<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+														<div class="row boxSolid ${tabName}${status.index}">
+															<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+														</div>
+														<c:set var="isBreak" value="true" ></c:set>
+														<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+													</c:when>
+												</c:choose>
+											</c:forEach>
+											<c:if test="${!isBreak}">
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+											</c:if>
+										</c:when>
+										<c:otherwise>
+											<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+											</div>
+											<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+										</c:otherwise>
+									</c:choose>
+								</c:if>
+								</div>
+								<!-- IP配置 -->
 								<c:if test="${region.regionType eq 1 }">
 									<h4 class="form-section">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
@@ -301,6 +359,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										</c:otherwise>
 									</c:choose>
 								</c:if>
+								
 							</c:forEach>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp

@@ -13,34 +13,89 @@
 		});
 		$(".action").on("change", function() {
 			$("#serviceId").val($(this).attr("serviceId"));
+			$("#protocolId").val($(this).attr("protocolId"));
 		});
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
-		$("#cfgFrom").validate(
-				{
-					submitHandler : function(form) {
-						/* var srcFile = $("#srcFile").val();
-						var srcUrl = $("#srcUrl").val();
-						if((srcUrl==null||srcUrl=="") && (srcFile==null || srcFile=="")){
-							$("div[for='srcFile']").append("<label id='level-error' class='error' for='srcFile'><spring:message code='required'></spring:message></label>");
-							return false;
-						}else{
-						} */
-						loading('onloading...');
-						form.submit();
-
-					},
-					errorContainer : "#messageBox",
-					errorPlacement : function(error, element) {
-						$(element).parents(".form-group").find(
-								"div[for='" + element.attr("name") + "']")
-								.append(error);
-					},
+		$("#protocolId").val($(".action:checked").attr("protocolId"));
+		$("#cfgFrom").validate({
+			errorPlacement: function(error,element){
+				if($(element).parents().hasClass("tagsinput")){
+					$(element).parents(".col-md-6").next("div").append(error);
+				}else{
+					$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+				}
+			},
+			submitHandler : function(form) {
+				var flag = true;
+				//代表所有业务都隐藏了，提示必须增加一种业务数据
+				if($(".boxSolid").length ==$(".boxSolid.hidden").length){
+					top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+					return;
+				}
+				$("input[name$='cfgKeywords']").each(function(){
+					if($(this).val()==''){
+						$(this).parents(".form-group").find(
+								"div[for='"
+										+ $(this).attr("name")
+										+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
+						flag = false;
+					}
+				})
+				$("select[name$='isHexbin']").each(function(){
+					var isHexbin=$(this).val();
+					if(isHexbin == 1){ //十六进制 
+						var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+						if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+							$(this).parents(".form-body").find(
+									"div[for='"
+											+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+											+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+							flag = false;
+						}					
+					}
 				});
+				if(flag){
+					//将disable属性的元素删除
+					$(".disabled").each(function(){
+						$(this).remove();
+					});
+					$("input[name$='exprType']").attr("disabled",false);
+					if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
+						$("input[name$='exprType']").val(1);
+					}
+					loading('onloading...');
+					form.submit();
+				}else{
+					return;
+				}
+
+			},
+			errorContainer : "#messageBox",
+			errorPlacement : function(error, element) {
+					$(element).parents(".form-group").find(
+							"div[for='" + element.attr("name") + "']")
+							.append(error);
+			},
+		});
 	});
+	//业务窗口打开
+	var addContent = function(obj, contentClassName) {
+		var showDiv = $(obj).parent().parent().next();
+		$(showDiv).removeClass("hidden").removeClass(
+				"disabled");
+		$(obj).addClass("hidden");
+	}
+
+	//业务窗口关闭
+	var delContent = function(contentClassName, addBtnClassName) {
+		$("." + contentClassName).addClass("hidden").addClass("disabled");
+		$("." + addBtnClassName).removeClass("hidden");
+	}
 </script>
 </head>
 <body>
-
+	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
 
 		<h3 class="page-title">
@@ -183,6 +238,49 @@
 										</div>
 									</div>
 								</div>
+								<!-- subscribeId配置 -->
+								<c:set var="subscribeIdCfgIndex" value="0"></c:set>
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+								<c:if test="${region.configServiceType eq 'subscribe_id'}">
+									<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+									<h4 class="form-section">
+										<spring:message code="${region.configRegionValue}" />
+										<small> <span
+											class="glyphicon glyphicon-plus ${tabName}Add"
+											onClick="addContent(this,'${tabName}')" title="add"></span></small>
+									</h4>
+									<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdCfgIndex}]"></c:set>
+									<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+									<c:choose>
+										<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0 and (!empty _cfg.ntcSubscribeIdCfgList[subscribeIdCfgIndex].cfgId)}">
+											<c:set var="isBreak" value="false" ></c:set>
+											<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+												<c:choose>
+													<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+														<div class="row boxSolid ${tabName}${status.index}">
+															<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+														</div>
+														<c:set var="isBreak" value="true" ></c:set>
+														<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+													</c:when>
+												</c:choose>
+											</c:forEach>
+											<c:if test="${!isBreak}">
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+											</c:if>
+										</c:when>
+										<c:otherwise>
+											<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+											</div>
+											<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
+										</c:otherwise>
+									</c:choose>
+								</c:if>
+								</c:forEach>
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
 							</div>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -36,6 +36,51 @@
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			//var compileId=$(this).attr("compileId");
+			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/fileTransfer/ajaxFileDigestSubIdList',
+					data:{"cfgId":cfgId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td style='border-right: 1px solid #FFFFFF;'>"+
+					 		"<input type='checkbox' hidden='hidden'/>"+
+					 	"</td>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		});
 	}); 
 </script>
 
@@ -289,6 +334,7 @@
 								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
 								<tr>
 									<td>
+										<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
 								    <td>${indexCfg.cfgDesc }</td>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp

@@ -0,0 +1,79 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 2 }">
+			<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />:</label><label>
+								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='whether_hexbinary' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+	
+</c:forEach>
+</html>