From c23a376b310116b5a6ffb82dea97ac11c4682d6b Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Nov 2018 20:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dasn=20ip=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84IP=E4=B9=9F=E4=BC=9A?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/basics/AsnIpCfgService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java index c55f8ae86..252cfcfb2 100644 --- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java +++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java @@ -80,8 +80,12 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveAsnIpBatch(Map> cfgs,int total) { + //需要通过删除域接口删除的ip集合 List toDelAsnIpCfgs=Lists.newArrayList(); + //需要本地保存的IP集合 List toSaveAsnIpCfgs=Lists.newArrayList(); + //需要通过新增域接口新增的ip集合 + List toAddRegionAsnIpCfgs=Lists.newArrayList(); List isImportAll=DictUtils.getDictList("IS_ASN_IP_IMPORT_ALL"); List idList=ConfigServiceUtil.getId(3, total); int ind=0; @@ -103,6 +107,7 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { cfg.setIsValid(Constants.VALID_NO); else { cfg.setIsValid(Constants.VALID_YES); + toAddRegionAsnIpCfgs.add(cfg); } ind++; } @@ -119,8 +124,8 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { if(toDelAsnIpCfgs.size()>0) { asnIPRegionSendToMaat(toDelAsnIpCfgs,Constants.VALID_NO); } - if(toSaveAsnIpCfgs.size()>0) { - asnIPRegionSendToMaat(toSaveAsnIpCfgs,Constants.VALID_YES); + if(toAddRegionAsnIpCfgs.size()>0) { + asnIPRegionSendToMaat(toAddRegionAsnIpCfgs,Constants.VALID_YES); } } /**