diff --git a/src/main/java/com/nis/restful/RestBusinessCode.java b/src/main/java/com/nis/restful/RestBusinessCode.java index fb41663..89c5dd6 100644 --- a/src/main/java/com/nis/restful/RestBusinessCode.java +++ b/src/main/java/com/nis/restful/RestBusinessCode.java @@ -409,6 +409,15 @@ public enum RestBusinessCode { * 域配置中的tableName不是分组复用的域表 */ TableNameUnReuse(4002102, "域配置中tableName不是分组复用的域表"), + /** + * 分组复用域配置下发到阀门时userRegion不能为空 + */ + ReUseUserRegionIsNull(4002102, "域配置需要下发到阀门,userRegion不能为空"), + + /** + * 添加分组复用域配置时,service只能为空或1028 + */ + ReUseServiceRange(4002102, "添加分组复用域配置时,service只能为空或1028"), /** *数值域配置的lowBoundary值不在有效范围内 diff --git a/src/main/java/com/nis/util/GroupReuseVal.java b/src/main/java/com/nis/util/GroupReuseVal.java index 28b99f7..ab9311d 100644 --- a/src/main/java/com/nis/util/GroupReuseVal.java +++ b/src/main/java/com/nis/util/GroupReuseVal.java @@ -97,6 +97,22 @@ public class GroupReuseVal { for (IpRegion ipRegion : ipRegionList) { // if (groupReuse.getIsValid() != 0 && // !regionGroupIdList.contains(ipRegion.getGroupId())) { + if (!StringUtil.isEmpty(groupReuse.getService())) { + if (groupReuse.getService().intValue()!=1028) { + throw new RestServiceException("ipRegionList中的regionId为" + + ipRegion.getRegionId() + + "的域配置的service只能为空或1028", + RestBusinessCode.ReUseServiceRange + .getValue()); + } + if (StringUtil.isEmpty(ipRegion.getUserRegion())) { + throw new RestServiceException("ipRegionList中的regionId为" + + ipRegion.getRegionId() + + "的域配置需要下发到阀门,userRegion不能为空", + RestBusinessCode.ReUseUserRegionIsNull + .getValue()); + } + } if (!StringUtil.isEmpty(ipRegion.getTableName()) && !groupReuseRegionMap.get("ipRegion").contains(ipRegion.getTableName())) {