asn ip去掉导入模板中的cfgDesc

;
修复主表中未存储commonGroupIds的bug;
asn ip导入时,asn_group_info的regionid
This commit is contained in:
duandongmei
2019-01-18 15:15:06 +06:00
parent 2d4a1a6685
commit b9c9b5aab9
3 changed files with 19 additions and 7 deletions

View File

@@ -181,6 +181,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
if(!asnNoMap.isEmpty()) {
List<Integer> compileIds=ConfigServiceUtil.getId(1, asnNoMap.size());
List<Integer> groupIds=ConfigServiceUtil.getId(2, asnNoMap.size());
List<Integer> regionIds=ConfigServiceUtil.getId(3, asnNoMap.size());
for(Entry<Long, AsnGroupInfo> e:asnNoMap.entrySet()) {
AsnGroupInfo info=e.getValue();
info.setAsnId(e.getKey());
@@ -189,6 +190,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
info.setCreateTime(createTime);
info.setGroupId(groupIds.get(index));
info.setCompileId(compileIds.get(index));
info.setRegionId(regionIds.get(index));
if(!groupSet.contains(info.getOrganization())) {
groupSet.add(info.getOrganization());
}