gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

26号之前的asn ip导入版本，区分ipv4和ipv6，v4和v6互不影响

Browse Source
This commit is contained in:
duandongmei
2019-01-29 09:22:33 +06:00
parent 32d4ad3cd7
commit 2abffe2e34
5 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -1650,9 +1650,17 @@ public class BaseController {
}
//全量下发，删除asnNo对应的已有的IP
if(isImportAll.get(0).getItemCode().equals("1")) {
Integer ipType=null;
if((!ipPortCfgs.isEmpty())){
BaseIpCfg baseIpCfg=ipPortCfgs.take();
ipPortCfgs.put(baseIpCfg);
if(!StringUtil.isEmpty(baseIpCfg)){
ipType=baseIpCfg.getIpType();
}
}
logger.warn("Delete and send ip reuse regions start");
long _start=System.currentTimeMillis();
deleteIps(asnNoMaps.get(1));
deleteIps(asnNoMaps.get(1),ipType);
long _end=System.currentTimeMillis();
logger.warn("Delete and send ip reuse regions end,cost:"+(_end-_start));
}
@@ -2383,7 +2391,7 @@ public class BaseController {
logger.warn("import finish,cost:"+(end-start));
}
public void deleteIps(Map<Long,AsnGroupInfo> asnNoMap){
public void deleteIps(Map<Long,AsnGroupInfo> asnNoMap,Integer ipType){
List<AsnIpCfg> toDelAndSendAsnIpCfgs=Lists.newArrayList();
List<Long> asnIds=Lists.newArrayList(asnNoMap.size());
for(Entry<Long, AsnGroupInfo> e:asnNoMap.entrySet()) {
@@ -2399,7 +2407,7 @@ public class BaseController {
}
}
if(asnIds.size()>0) {
asnIpCfgService.deleteByAsnNo(asnIds);
asnIpCfgService.deleteByAsnNo(asnIds,ipType);
}
if(toDelAndSendAsnIpCfgs.size()>0) {
int pointsDataLimit = Constants.MAAT_JSON_SEND_SIZE;//限制条数