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 getAllAsnGroup(){ + List 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 map=(Map)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 policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4); // model.addAttribute("policyGroups", policyGroups); + AsnCacheUtils.init(); + List 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 @@ - +