diff --git a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java index b901a5f3a..95c8afc01 100644 --- a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java @@ -195,7 +195,7 @@ public class IpAddrPoolCfgService extends BaseService{ ip.setService(ipcfg.getServiceId()); ip.setAddrPoolId(cfg.getCfgId()); ip.setOpTime(auditTime); - //ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds());//添加区域管控 + ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds());//添加区域管控 resStrategyList.add(ip); } @@ -240,7 +240,7 @@ public class IpAddrPoolCfgService extends BaseService{ ip.setService(ipcfg.getServiceId()); ip.setAddrPoolId(cfg.getCfgId()); ip.setOpTime(auditTime); - //ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds()); + ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds()); resStrategyList.add(ip); } //调用服务接口取消配置 diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index a60e48b5b..56b2bafc2 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -126,6 +126,7 @@ public class IpMultiplexService extends BaseService{ cfg = this.getPolicyCfg(cfg.getCfgId(), null); String json=""; if(cfg.getIsAudit() == Constants.AUDIT_YES){ + String areaEffectiveIds = cfg.getIsAreaEffective() == 1?sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds()):"0"; Map params = new HashMap(); params.put("configId", cfg.getCompileId()); params.put("addrPoolId", cfg.getAddrPoolId()); @@ -133,9 +134,8 @@ public class IpMultiplexService extends BaseService{ params.put("userId", cfg.getUserId()); params.put("isValid", 1); params.put("opTime", auditTime); - if(cfg.getIsAreaEffective() == 1){ - params.put("effectiveRange", sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds())); - } + params.put("effectiveRange", areaEffectiveIds); + List list = Lists.newArrayList(); list.add(params); //调用服务接口下发配置数据 @@ -153,6 +153,7 @@ public class IpMultiplexService extends BaseService{ } }else if(cfg.getIsAudit() == Constants.AUDIT_NOT_YES){ + String areaEffectiveIds = cfg.getIsAreaEffective() == 1?sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds()):"0"; Map params = new HashMap(); params.put("configId", cfg.getCompileId()); params.put("addrPoolId", cfg.getAddrPoolId()); @@ -160,9 +161,8 @@ public class IpMultiplexService extends BaseService{ params.put("userId", cfg.getUserId()); params.put("isValid", 0); params.put("opTime", auditTime); - if(cfg.getIsAreaEffective() == 1){ - params.put("effectiveRange", sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds())); - } + params.put("effectiveRange", areaEffectiveIds); + List list = Lists.newArrayList(); list.add(params); //调用服务接口取消配置 diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp index 72d588048..9474516a5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp @@ -45,6 +45,7 @@ $(function(){ + @@ -159,8 +160,7 @@ $(function(){ -
- <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> + <%--
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%> --%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp index 4095a13ac..581878972 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp @@ -293,7 +293,7 @@ - + <%-- --%> @@ -349,14 +349,14 @@ - + <%-- - + --%> ${indexCfg.requestName }