From 427619d0881dba3a47406fc3cf48c11fd9a8a93c Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Sat, 19 Jan 2019 10:24:13 +0600
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=94=9F=E6=95=88=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=AA=8C=E8=AF=81=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84asn=E9=85=8D=E7=BD=AE=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E8=A2=AB=E5=88=A0=E9=99=A4=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E7=94=A8=E6=88=B7=E9=87=8D=E6=96=B0=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag | 63 ++++++++++++++++++++-
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index ce2363ace..c9e6a709f 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -143,8 +143,10 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 		if(validateAllNoAudit(checkboxes)){
 			top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
 			return;
+		}else if(validAsnIsDeleted(checkboxes)){
+			return;
 		}else{
-					doAll(checkboxes,url);
+				doAll(checkboxes,url);
 		}
 	}else{
 		/* 	批量下发待测试
@@ -185,13 +187,19 @@ function cancelPassOpt(url){
 		if(validateAllPass(checkboxes)){
 			
 			var addrPoolIds = [],canCancel = true;
+			var compileIds = [];
 			$(checkboxes).filter(":checked").each(function(){
 				var addrPoolId = $(this).attr("addressPoolId");
+				var serviceId = $(this).attr("serviceId");
+				var compileId = $(this).attr("compileId");
 				if(typeof addrPoolId != "undefined"){
 					addrPoolIds.push(addrPoolId);
 				}
+				//记录代理证书的配置
+				if(typeof serviceId != "undefined" && serviceId==520 && typeof compileId != "undefined"){
+					compileIds.push(compileId);
+				}
 			});
-			
 			// 地址池管理 （被策略引用的地址池不可取消）
 			if(addrPoolIds.length > 0){
 				$.ajax({
@@ -207,6 +215,23 @@ function cancelPassOpt(url){
 	 				}
 	 			});
 			}
+			if(canCancel){
+				//查询证书是否被拦截策略引用
+				if(compileIds.length > 0){
+					$.ajax({
+		 				type:'post',
+		 				url:'${ctx}/proxy/intercept/strateagy/ajaxKeyinfIsUsed',
+		 				data:{"compileIds":compileIds.join(',')},
+		 				async:false,
+		 				success:function(data){//处理返回结果
+		 					if(data == false){
+		 						top.$.jBox.tip('<spring:message code="keyring_is_used"/>');
+		 						canCancel=data;
+		 					}
+		 				}
+		 			});
+				}
+			}
 			
 			if(canCancel){
 				doAll(checkboxes,url);
@@ -381,6 +406,40 @@ function cancelPassOpt(url){
 		});
 		return flag;
 	}
+	//配置审核通过之前，测试此配置下是否有已经删除的ASN，提示用户重新编辑再下发
+	function validAsnIsDeleted(checkboxes){
+		var flag = false;
+		var compileIdStr="";
+		checkboxes.each(function(){
+		    if(true == $(this).is(':checked')){
+	    		  compileIdStr +=$(this).parent().find("span[cfgid='"+$(this).attr("id")+"']").attr("compileId")+",";
+		    }
+		  });
+		//根据compileId查询，此配置下是否有配置已经删除
+		$.ajax({
+			type:'post',
+			url:'${ctx}/basics/asnGroup/checkAsnRegionIsDeleted',
+			data:{"compileIds":compileIdStr},
+			async:false,
+			success:function(data,textStatus){//处理返回结果
+				if(textStatus == 'success'){
+					var keyValue="";
+					for(var key in data){   //key    data[key]
+				        console.log(key + "==" + data[key]);	
+				        keyValue+=data[key]+"<br>";
+				    }
+					if(keyValue !=''){
+						top.$.jBox.info(keyValue+"<spring:message code='reedit'/>","<spring:message code='info'/>");
+						top.$('.jbox-body .jbox-icon').css('top','55px');
+						flag= true;
+					}
+					
+				}
+				/* window.location = url+"&ids="+ids+"&compileIds="+compileIds; */
+			}
+		});
+		return flag;
+	}
 	//验证是否可删除
 	function validateIsDelete(checkboxes){
 		var flag = false;