1:修改asn-ip添加user-region字段,三个支持分组复用的配置都要添加user-region字段了,所以service字段就不需要了

2:修改nms上传接口时判断有问题的机器列表list是否为空
This commit is contained in:
renkaige
2018-10-26 10:48:13 +08:00
parent 0a6e9731a1
commit e0beecdfee
6 changed files with 23 additions and 26 deletions

View File

@@ -98,14 +98,14 @@ 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(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()
@@ -113,7 +113,7 @@ public class GroupReuseVal {
RestBusinessCode.ReUseUserRegionIsNull
.getValue());
}
}
// }
if (!StringUtil.isEmpty(ipRegion.getTableName())
&& !groupReuseRegionMap.get("ipRegion").contains(ipRegion.getTableName())) {