diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index 3900a2343..4a137f84e 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java @@ -54,7 +54,7 @@ public class IpMultiplexPoolCfgController extends BaseController { } //查询ip复用地址池配置的policyGroup列表 - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(3); + List policyGroups=policyGroupInfoService.getHasAreaPolicyGroups(3); model.addAttribute("policyGroups", policyGroups); model.addAttribute("_cfg", cfg); return "/cfg/maintenance/ipMultiplexPool/form"; @@ -160,7 +160,7 @@ public class IpMultiplexPoolCfgController extends BaseController { } //查询ip复用地址池配置的policyGroup列表 - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2); + List policyGroups=policyGroupInfoService.getHasAreaPolicyGroups(2); model.addAttribute("policyGroups", policyGroups); model.addAttribute("_cfg", cfg); return "/cfg/maintenance/ipMultiplexPool/snatform"; diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index e60839262..75ea61b6e 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -133,19 +133,9 @@ public class IpMultiplexController extends CommonController { @RequiresPermissions(value={"snat_policy:config"}) public String snatPolicyForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) { this._ipForm(cfgName,model, ids, functionId, entity); - SysDataDictionaryItem dict=null; - List dictList= DictUtils.getDictList("GROUP_TYPE"); - for(SysDataDictionaryItem di:dictList){ - if("2".equals(di.getItemCode())){ - dict=di; - break; - } - } - if(dict!=null){ - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(Integer.parseInt(dict.getItemCode())); - model.addAttribute("policyGroups", policyGroups); - } - + // 获取拥有区域信息的策略分组 + List policyGroups = policyGroupInfoService.getHasAreaPolicyGroups(2); + model.addAttribute("policyGroups", policyGroups); model.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); return "/cfg/manipulation/ipmulitiplex/snatPolicyForm"; } @@ -182,19 +172,9 @@ public class IpMultiplexController extends CommonController { @RequiresPermissions(value={"dnat_policy:config"}) public String dnatPolicyForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) { this._ipForm(cfgName,model, ids, functionId, entity); - SysDataDictionaryItem dict=null; - List dictList= DictUtils.getDictList("GROUP_TYPE"); - for(SysDataDictionaryItem di:dictList){ - if("3".equals(di.getItemCode())){ - dict=di; - break; - } - } - if(dict!=null){ - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(Integer.parseInt(dict.getItemCode())); - model.addAttribute("policyGroups", policyGroups); - } - + // 获取拥有区域信息的策略分组 + List policyGroups=policyGroupInfoService.getHasAreaPolicyGroups(3); + model.addAttribute("policyGroups", policyGroups); model.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); return "/cfg/manipulation/ipmulitiplex/dnatPolicyForm"; } diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java index bdaa5a794..c1cc3b1f0 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java @@ -18,4 +18,5 @@ public interface PolicyGroupInfoDao extends CrudDao { List findNatPolicyGroups(); PolicyGroupInfo getInfoByAsnNo(PolicyGroupInfo policyGroupInfo); + List getHasAreaPolicyGroups(int groupType); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml index b50367fa1..048e508fa 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml @@ -176,4 +176,17 @@ + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java index 0305e5c18..c50e4fada 100644 --- a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java +++ b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java @@ -145,8 +145,12 @@ public class PolicyGroupInfoService extends BaseService{ return policyGroupInfoDao.getInfoByAsnNo(policyGroupInfo); } - public void getByIds(String ids) { - // TODO Auto-generated method stub - + /** + * IP复用配置表单-获取拥有区域信息的策略分组 + * @param groupType + * @return + */ + public List getHasAreaPolicyGroups(int groupType) { + return policyGroupInfoDao.getHasAreaPolicyGroups(groupType); } } diff --git a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp index d1678ed1a..eccf64e27 100644 --- a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp @@ -2,9 +2,18 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%>

@@ -44,7 +53,7 @@ $(function(){