From ef5c6cdfa66f6c945e63d52fb367e3849a1dee75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Tue, 12 Mar 2019 11:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9B=9E=E8=B0=83=E7=B1=BB?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E6=89=93=E5=BC=80asn=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/CommonPolicyService.java  | 13 +++++++++++--
 src/main/resources/service/service_config.xml       |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
index 563a191ce..526638f6b 100644
--- a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
+++ b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
@@ -165,7 +165,7 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
 			//调用服务接口取消配置
 			String json=gsonToJson(maatBean);
-			if(StringUtil.isEmpty(list)) {
+			if(!StringUtil.isEmpty(list)) {
 				logger.info("批量配置取消（"+page.getPageNo()+"次）个数："+list.size());
 			}
 			//调用服务接口下发配置
@@ -269,6 +269,8 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 	 * @throws ClassNotFoundException
 	 */
 	public void auditCallBackData(List auditList,List compileIds,List ids,BaseCfg entity){
+		long start=System.currentTimeMillis();
+		long end=System.currentTimeMillis();
 		if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) {
 			commonPolicyDao.auditCfgBatch( "cfg_index_info", entity,compileIds,null);
 		}
@@ -290,10 +292,17 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 		}else if(entity.getIsAudit()==3){
 			//调用服务接口取消配置
 			String json=gsonToJson(auditList);
-			logger.info("批量下发配置参数："+json);
+			//logger.info("批量下发配置参数："+json);
+			if(!StringUtil.isEmpty(auditList)) {
+				logger.info("批量配置取消个数："+auditList.size());
+			}
+			logger.info("回调配置批量失效-下发：start()");
+			start=System.currentTimeMillis();
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.put(json,2);
+			end=System.currentTimeMillis();
 			logger.info("批量响应信息："+result.getMsg());
+			logger.info("回调配置批量失效-下发耗时：end("+(end-start)+")");
 		}
 	}
 }
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 00f01520f..bbd4b1038 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -18,14 +18,14 @@
 	<!-- <service id="128" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP地址监测">
 	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 	</service> -->
-	<!-- <service id="37" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN封堵">
+	<service id="37" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN封堵">
 	    <serviceCfg cfgType="2" tableName="asn_keyword_cfg"  groupReuse="true" groupId="userRegion4"></serviceCfg>
 	    <userRegion regionKey="ASN_ID" regionColumn="userRegion5"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="149" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN监测">
 	    	<serviceCfg cfgType="2" tableName="asn_keyword_cfg"  groupReuse="true" groupId="userRegion4"></serviceCfg>
 	    	<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0"  ></userRegion>
-	</service> -->
+	</service>
 	<!-- <service id="3" functionId="5" serviceType="2" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃">
 	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 	</service> -->