asnip导入模板增加

intercept ip monitor 协议tcp
			 whitelist 协议tcp(默认) udp

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

@@ -23,6 +23,8 @@
 					</div>
 						<input type="hidden" name="fucntionId" id="fucntionId" value="${cfg.functionId }">
 						</br>
+						<c:if test="${serviceList != null && serviceList.size() > 0}">
+						
 						<div class="form-group service">
 							<label class="control-label col-md-3"> <spring:message
 									code="action" />
@@ -55,6 +57,7 @@
 							</div>
 							<div for="action"></div>
 						</div>
+						</c:if>
 						<div class="form-group region">
 							<label class="control-label col-md-3"> <spring:message
 									code="cfg_type" />
@@ -159,8 +162,22 @@
 							    	 	 </select>
 						    	 	 </div>
 								</div>
-						</c:if>
 						</br>
+						</c:if>
+						<!-- 600 ASNIP导入 -->
+						<c:if test="${cfg.functionId eq 600 }">
+							<div class="row">
+					    	 	<label class="control-label col-md-3"><spring:message code="group"/></label>
+					    	 	 <div class="col-md-6">
+						    	 	 <select name="asnGroupId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
+		               					<c:forEach items="${policyGroups }" var="policyGroup" varStatus="status">
+											<option value="${policyGroup.serviceGroupId}" <c:if test="${status.index eq 1 }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+				              			</c:forEach>
+					                </select>
+					    	 	 </div>
+							</div>
+						</br>	
+						</c:if>						
 						<div class="col-md-12">
 							<div class="form-group">
 								<label class="col-md-2 control-label" style="margin-top:5px;"><spring:message

src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp

@@ -58,6 +58,17 @@
 			onClick="javascript:window.location='${ctx}/basics/asn/addForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>
+				<c:set var="regionImport" value="false"></c:set>
+				<c:forEach items="${regionList}" var="region" >
+					<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
+						<c:set var="regionImport" value="true"></c:set>
+					</c:if>
+				</c:forEach>
+				<c:if test="${regionImport eq 'true'}">
+					<button type="button" class="btn btn-primary import" >
+						<i class="fa fa-plus"></i>
+					<spring:message code="import"></spring:message></button>
+				</c:if>
 			</shiro:hasPermission>
 	</div>
 
@@ -370,6 +381,8 @@
 			</div>
 		</div>
 </div>
-
+<c:set var="importPath" value="/basics/asn/list?functionId=${cfg.functionId}"/>
+<!-- 模板导入，start -->
+<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>
 </html>