diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index f3f942d7e..155a044a1 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -230,15 +230,15 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected Integer groupId;//仅用于copy属性使用 protected Integer regionId;//仅用于copy属性使用 - protected Integer numberRegionGroupId;//仅用于copy属性使用 +// protected Integer numberRegionGroupId;//仅用于copy属性使用 protected Integer numberRegionRegionId;//仅用于copy属性使用 - public Integer getNumberRegionGroupId() { - return numberRegionGroupId; - } - public void setNumberRegionGroupId(Integer numberRegionGroupId) { - this.numberRegionGroupId = numberRegionGroupId; - } +// public Integer getNumberRegionGroupId() { +// return numberRegionGroupId; +// } +// public void setNumberRegionGroupId(Integer numberRegionGroupId) { +// this.numberRegionGroupId = numberRegionGroupId; +// } public Integer getNumberRegionRegionId() { return numberRegionRegionId; } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index c7868233f..d6c105e83 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1417,7 +1417,7 @@ public class BaseController { List compileIds=Lists.newArrayList(); List regionIds=Lists.newArrayList(); List groupIds=Lists.newArrayList(); - List numRegionGroupIds=Lists.newArrayList(); +// List numRegionGroupIds=Lists.newArrayList(); List numRegionRegionIds=Lists.newArrayList(); if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取 try { @@ -1428,7 +1428,7 @@ public class BaseController { } //需要获取数值域的id if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { - numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); +// numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); } } catch (Exception e) { @@ -1468,9 +1468,9 @@ public class BaseController { cfg.setRegionId(regionIds.get(ind)); } if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { - if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { - cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); - } +// if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { +// cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); +// } if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) { cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind)); } diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 4ecbce585..f9a7affdb 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -597,11 +597,7 @@ public abstract class BaseService { if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) { if (numGroupId == 0) { GroupCfg group1 = new GroupCfg(); - if(baseIpCfg.getNumberRegionGroupId()!=null) { - group1.setGroupId(baseIpCfg.getNumberRegionGroupId()); - }else { - group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); - } + group1.setGroupId(groupId); group1.setCompileId(baseIpCfg.getCompileId()); group1.setAuditTime(baseIpCfg.getAuditTime()); group1.setIsValid(baseIpCfg.getIsValid());