From 3c42039573ff1405ab152a40129482fc475f972c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Mon, 18 Feb 2019 06:14:17 +0000
Subject: [PATCH] =?UTF-8?q?asn=20ip=E5=AF=BC=E5=85=A5=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=85=A8?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=85=A8=E9=87=8F=E6=89=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=88=A0=E9=99=A4=E6=97=A7=E7=9A=84asnip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 44be854707aa83b11081e1a2a60059f87212de6d)
---
 .../web/service/basics/AsnIpCfgService.java   | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 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 f1e26bb66..33414817c 100644
--- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
+++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
@@ -168,15 +168,25 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			auditAllAsnRegionCfg(entity,auditAsnGroupList,null);
 		}*/
 	}
+	/**
+	 * 
+	 * @param asnIpCfgs
+	 * @param asnIds
+	 * @param isImportAll 增量或者全量
+	 */
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveAsnIp(List<AsnIpCfg> asnIpCfgs,String asnIds){
+	public void saveAsnIp(List<AsnIpCfg> asnIpCfgs,String asnIds,String isImportAll){
 		logger.warn("Start to  only save asn ip size:"+asnIpCfgs.size());
 		long start=System.currentTimeMillis();
 		SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
         SqlSession batchSqlSession = null;
         try{
         	if(!StringUtil.isEmpty(asnIpCfgs)){
-        		asnIpCfgDao.deleteByAsnId(asnIds);
+        		//全量时需要删除asn 下的所有ip
+        		if("1".equals(isImportAll)){
+        			asnIpCfgDao.deleteByAsnId(asnIds);
+        		}
+        		
         		batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
         		for (AsnIpCfg cfg : asnIpCfgs) {
         			((AsnIpCfgDao) batchSqlSession.getMapper(AsnIpCfgDao.class)).insert(cfg);
@@ -292,12 +302,12 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			maatBean.setOpAction(Constants.INSERT_ACTION);
 			//调用服务接口下发配置数据
 			String json=gsonToJson(maatBean);
-			//logger.info("asn ip maat结构配置下发配置参数："+json);
-			logger.info("asn ip maat结构配置下发配置参数：");
+			logger.info("asn ip maat结构配置下发配置参数："+json);
+			//logger.info("asn ip maat结构配置下发配置参数：");
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
-			//logger.info("asn ip maat结构配置下发响应信息："+result.getMsg());
-			logger.info("asn ip maat结构配置下发响应信息：");
+			logger.info("asn ip maat结构配置下发响应信息："+result.getMsg());
+			//logger.info("asn ip maat结构配置下发响应信息：");
         }else{
         	if(!StringUtil.isEmpty(auditList)){
         		asnIPRegionSendToMaat(auditList, 1, Constants.OPACTION_POST);