From 52811f09e9c1d9110618a7a800d3380d845074d8 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Wed, 16 Jan 2019 14:34:47 +0600
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85asn=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/20190116/alert_asn_function_table.sql |  9 ++++++++
 .../WEB-INF/views/cfg/ipaddr/ipForm.jsp       | 21 ++++++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 src/main/resources/sql/20190116/alert_asn_function_table.sql

diff --git a/src/main/resources/sql/20190116/alert_asn_function_table.sql b/src/main/resources/sql/20190116/alert_asn_function_table.sql
new file mode 100644
index 000000000..ca2e3cd7a
--- /dev/null
+++ b/src/main/resources/sql/20190116/alert_asn_function_table.sql
@@ -0,0 +1,9 @@
+ALTER TABLE cfg_index_info ADD  common_group_ids varchar(200) DEFAULT '' COMMENT 'compile的公共组ID[方便配置取消的时候需要保留公共组]';
+#拥有此标记的组，maat配置引用之后，之下发组和编译的关系。且已被引用的asn域修改和删除需要走update和delete公共组域的接口，进行域更新。
+ALTER TABLE config_group_info ADD  is_used int(2) DEFAULT 0 COMMENT '是否被策略引用过';
+#拥有此标记的组，新增域需要自动下发。
+ALTER TABLE config_group_info ADD  is_audit_all int(2) DEFAULT 0 COMMENT '是否有策略标记为组下配置全部下发(即全选)';
+#拥有此标记的asnRegion，asn信息修改和删除需要走update和delete公共组域的接口
+ALTER TABLE asn_group_info ADD  is_used int(2) DEFAULT 0 COMMENT 'asn作为域，是否已被maat策略引用并下发过';
+#asn作为公共组的域，域的修改和删除接口都需要使用reigonId直接修改和删除
+ALTER TABLE asn_group_info ADD  region_id int(20) DEFAULT 0 COMMENT 'asn作为域，需要预先获取regionId';
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index 34343a150..576e797db 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -697,20 +697,21 @@ var showHideIPSECProtocol=function(obj){
 														</c:if>
 														<c:if test="${region.regionType eq 7 }">
 																<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-																<h4 class="form-section asn">
+																<h4 class="form-section">
 																		<spring:message code="${region.configRegionValue}" />
 																		<small> <span
-																			class="glyphicon glyphicon-plus asn ${tabName}Add"
+																			class="glyphicon glyphicon-plus ${tabName}Add"
 																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
 																</h4>
+																<c:set var="cfgName" value="asnKeywords[${asnIndex}]"></c:set>
 																<c:choose>
-																	<c:when test="${fn:length(fn:split(_cfg.userRegion4,','))>0}">
+																	<c:when test="${fn:length(_cfg.asnKeywords)>0}">
 																		<c:set var="isBreak" value="false" ></c:set>
-																		<c:forEach items="${fn:split(_cfg.userRegion4,',')}" var="asn">
+																		<c:forEach items="${_cfg.asnKeywords}" var="cfg">
 																			<c:choose>
 																				<c:when test="${!isBreak}">
-																					<div class="row boxSolid asn ${tabName}${status.index}">
-																						<%@include file="/WEB-INF/views/cfg/ipaddr/asnForm.jsp"%>
+																					<div class="row boxSolid ${tabName}${status.index}">
+																						<%@include file="/WEB-INF/views/cfg/asnForm.jsp"%>
 																					</div>
 																					<c:set var="isBreak" value="true" ></c:set>
 																					<c:set var="asnIndex" value="${asnIndex+1 }"></c:set>
@@ -718,15 +719,15 @@ var showHideIPSECProtocol=function(obj){
 																			</c:choose>
 																		</c:forEach>
 																		<c:if test="${!isBreak}">
-																			<div class="row boxSolid asn ${tabName}${status.index} hidden disabled">
-																				<%@include file="/WEB-INF/views/cfg/ipaddr/asnForm.jsp"%>
+																			<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+																				<%@include file="/WEB-INF/views/cfg/asnForm.jsp"%>
 																			</div>
 																			<c:set var="asnIndex" value="${asnIndex+1 }"></c:set>
 																		</c:if>
 																	</c:when>
 																	<c:otherwise>
-																		<div class="row boxSolid asn ${tabName}${status.index} hidden disabled">
-																			<%@include file="/WEB-INF/views/cfg/ipaddr/asnForm.jsp"%>
+																		<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+																			<%@include file="/WEB-INF/views/cfg/asnForm.jsp"%>
 																		</div>
 																		<c:set var="asnIndex" value="${asnIndex+1 }"></c:set>
 																	</c:otherwise>