From 7cd7983671b18ad835aac06b1d6e6e6e9a958bb1 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 21 Nov 2018 18:47:22 +0800
Subject: [PATCH] =?UTF-8?q?ASN=20IP=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6ASN=20IP=20Group=E4=BB=8E?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=B8=AD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/AsnCacheUtils.java       | 13 +++++++++++++
 .../nis/web/controller/basics/AsnIpController.java  |  3 +++
 .../webapp/WEB-INF/views/basics/asnIpCfgList.jsp    |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/util/AsnCacheUtils.java b/src/main/java/com/nis/util/AsnCacheUtils.java
index b875cf5ee..481074431 100644
--- a/src/main/java/com/nis/util/AsnCacheUtils.java
+++ b/src/main/java/com/nis/util/AsnCacheUtils.java
@@ -6,6 +6,7 @@ import java.util.Map.Entry;
 
 import org.apache.log4j.Logger;
 
+import com.beust.jcommander.internal.Lists;
 import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.web.dao.specific.ConfigGroupInfoDao;
 import com.nis.web.service.SpringContextHolder;
@@ -51,6 +52,18 @@ public class AsnCacheUtils{
 		logger.warn("clear cache!");
 		CacheUtils.getCacheManager().removeCache(ASN_NO_CACHE);
 	}
+	public static List<ConfigGroupInfo> getAllAsnGroup(){
+		List<ConfigGroupInfo> configGroupInfos=Lists.newArrayList();
+		Cache cache=getCache(ASN_NO_CACHE);
+		for(Object key:cache.getKeys()) {
+			Element element = getCache(ASN_NO_CACHE).get(key);
+			if(element!=null) {
+				Map<Long,ConfigGroupInfo> map=(Map<Long,ConfigGroupInfo>)element.getObjectValue();
+				configGroupInfos.addAll(map.values());
+			}
+		}
+		return configGroupInfos;
+	}
 	/**
 	 * 初始化缓存
 	 */
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 5d77eefe9..bad7cdfdf 100644
--- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java
+++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java
@@ -50,6 +50,9 @@ public class AsnIpController extends BaseController{
 		
 //		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
 //		model.addAttribute("policyGroups", policyGroups);
+		AsnCacheUtils.init();
+		List<ConfigGroupInfo> policyGroups=AsnCacheUtils.getAllAsnGroup();
+		model.addAttribute("policyGroups", policyGroups);
 		return "/basics/asnIpCfgList";
 	}
 	@RequestMapping(value = {"/addForm"})
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
index ad372dab1..9e6903056 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -104,7 +104,7 @@
                        				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
                        				 	<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>
+                       				 	<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
                        				 	</c:forEach>
                        				 </form:select>
 	                       		</div>