From 979ef742593c089a346bef44b8f51349615a7b0d Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 31 Aug 2018 09:33:15 +0800
Subject: [PATCH] =?UTF-8?q?asn=20ip=20=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5asn=20ip=E7=BB=84=E7=9A=84=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/basics/AsnIpController.java |  2 ++
 src/main/resources/messages/message_en.properties  |  3 ++-
 .../resources/messages/message_zh_CN.properties    |  3 ++-
 .../webapp/WEB-INF/views/basics/asnIpCfgList.jsp   | 14 +++++++++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java
index 6e9db0acf..92b7c0358 100644
--- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java
+++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java
@@ -32,6 +32,8 @@ public class AsnIpController extends BaseController{
 		Page<AsnIpCfg> page = asnIpCfgService.findPage(new Page<AsnIpCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
 		initPageCondition(model);
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
+		model.addAttribute("policyGroups", policyGroups);
 		return "/basics/asnIpCfgList";
 	}
 	@RequestMapping(value = {"/addForm"})
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 30ebb3f3d..839e9c313 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1136,4 +1136,5 @@ app_header_feature_monit=APP Header Feature Monitoring
 can_not_edit_issued_ans_ip=Can not edit issued ASN IP
 is_issued=Is Issued
 asn_ip_configuration=ASN IP Configuration
-asn_policy=ASN Policy
\ No newline at end of file
+asn_policy=ASN Policy
+asn_ip_group=ASN IP Group
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 60ba0c1cb..e17389a31 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1133,4 +1133,5 @@ app_header_feature_monit=APP\u5C42\u5934\u7279\u5F81\u76D1\u6D4B
 can_not_edit_issued_ans_ip=\u4E0D\u80FD\u4FEE\u6539\u5DF2\u7ECF\u4E0B\u53D1\u8FC7\u7684ASN IP
 is_issued=\u662F\u5426\u4E0B\u53D1
 asn_ip_configuration=ASN IP\u914D\u7F6E
-asn_policy=ASN\u7B56\u7565
\ No newline at end of file
+asn_policy=ASN\u7B56\u7565
+asn_ip_group=ASN IP\u7EC4
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
index a68ebe976..51a67c0c5 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -85,15 +85,23 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
-									<%-- <c:set var="state"><spring:message code='group'/></c:set>
+                       				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" >
+                       				 	<form:option value=""><spring:message code='asn_ip_group'/></form:option>
+                       				 	<c:forEach items="${policyGroups}" var="policyGroup">
+                       				 	<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
+                       				 	</c:forEach>
+                       				 </form:select>
+	                       		</div>
+								<%--<div class="pull-left">
+									 <c:set var="state"><spring:message code='group'/></c:set>
 									<form:select path="isAudit" class="selectpicker select2 input-small">
 										<form:option value=""><spring:message code="all_states"/></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
-									</form:select> --%>
-								</div>
+									</form:select> 
+								</div>--%>
 								
 								<div class="pull-left">