修正回调类配置批量取消失败问题

2 files changed, 139 insertions, 47 deletions

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 7e848536e..061220f90 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -3296,7 +3296,7 @@ public class BaseController {
  		//批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
 		if(!StringUtil.isEmpty(entity)) {
 			BaseCfg base=(BaseCfg)entity ;
-			if(!StringUtil.isEmpty(base.getSeltype()) && base.getSeltype().equals("isValid")) {
+			if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
 				base.setIsValid(null);
 				BeanUtils.copyProperties(base, entity);
 			}
@@ -3818,15 +3818,16 @@ public class BaseController {
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						
-						auditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
+						//auditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId())); // 移至下发前处理
+						auditList.add(cfg);
 					}else {
 						//定时任务审核通过，配置已经失效，则
 						cfg.setIsValid(entity.getIsValid());
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
+						//notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId())); // 移至下发前处理
+						notAuditList.add(cfg);
 					}
 				}
 				
@@ -3883,14 +3884,16 @@ public class BaseController {
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						auditList.add(BaseService.convertCallBackProxyObjKeyring(cfg));
+						//auditList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); // 移至下发前处理
+						auditList.add(cfg);
 					}else {
 						//定时任务审核通过，配置已经失效，则
 						cfg.setIsValid(entity.getIsValid());
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						notAuditList.add(BaseService.convertCallBackProxyObjKeyring(cfg));
+						//notAuditList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); // 移至下发前处理
+						notAuditList.add(cfg);
 					}
 				}
 			}else if(className.equals("PxyObjTrustedCaCert")){
@@ -3903,14 +3906,16 @@ public class BaseController {
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));
+						//auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); // 移至下发前处理
+						auditList.add(cfg);
 					}else {
 						//定时任务审核通过，配置已经失效，则
 						cfg.setIsValid(entity.getIsValid());
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));
+						//notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); // 移至下发前处理
+						notAuditList.add(cfg);
 					}
 				}
 				if(!StringUtil.isEmpty(ids)) {
@@ -3923,14 +3928,16 @@ public class BaseController {
 							cfg.setIsAudit(entity.getIsAudit());
 							cfg.setAuditTime(entity.getAuditTime());
 							cfg.setAuditorId(entity.getAuditorId());
-							auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg));
+							//auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg)); // 移至下发前处理
+							auditList.add(cfg);
 						}else {
 							//定时任务审核通过，配置已经失效，则
 							cfg.setIsValid(entity.getIsValid());
 							cfg.setIsAudit(entity.getIsAudit());
 							cfg.setAuditTime(entity.getAuditTime());
 							cfg.setAuditorId(entity.getAuditorId());
-							notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg));
+							//notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg)); // 移至下发前处理
+							notAuditList.add(cfg);
 						}
 					}
 				}
@@ -3952,14 +3959,16 @@ public class BaseController {
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						auditList.add(BaseService.convertCallBackDnsResStrategy(cfg));
+						//auditList.add(BaseService.convertCallBackDnsResStrategy(cfg)); // 移至下发前处理
+						auditList.add(cfg);
 					}else {
 						//定时任务审核通过，配置已经失效，则
 						cfg.setIsValid(entity.getIsValid());
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						notAuditList.add(BaseService.convertCallBackDnsResStrategy(cfg));
+						//notAuditList.add(BaseService.convertCallBackDnsResStrategy(cfg)); // 移至下发前处理
+						notAuditList.add(cfg);
 					}
 				}
 			}else if(className.equals("DnsIpCfg")){
@@ -3972,14 +3981,16 @@ public class BaseController {
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						auditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
+						//auditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId())); // 移至下发前处理
+						auditList.add(cfg);
 					}else {
 						//定时任务审核通过，配置已经失效，则
 						cfg.setIsValid(entity.getIsValid());
 						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
 						cfg.setAuditorId(entity.getAuditorId());
-						notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
+						//notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
+						notAuditList.add(cfg);
 					}
 				}
 			}else if(className.equals("IpPortCfg")){
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 58dea695a..857384b3c 100644
--- a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
+++ b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
@@ -1,44 +1,25 @@
 package com.nis.web.service.configuration;

 

-import java.lang.reflect.Field;

 import java.util.ArrayList;

 import java.util.Date;

-import java.util.HashMap;

-import java.util.Iterator;

 import java.util.List;

 import java.util.Map;

-import java.util.Properties;

 import java.util.Map.Entry;

 

-import net.sf.json.JSONObject;

-

-import org.apache.commons.lang3.StringUtils;

-import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.stereotype.Service;

 

 import com.google.common.collect.Lists;

 import com.nis.domain.Page;

-import com.nis.domain.basics.AsnGroupInfo;

-import com.nis.domain.basics.AsnIpCfg;

-import com.nis.domain.configuration.AppPolicyCfg;

-import com.nis.domain.configuration.AreaIpCfg;

-import com.nis.domain.configuration.AvFileSampleCfg;

+import com.nis.domain.callback.InlineIp;

+import com.nis.domain.callback.NtcDnsResStrategy;

+import com.nis.domain.callback.ProxyObjKeyring;

+import com.nis.domain.callback.ProxyObjTrustedCa;

 import com.nis.domain.configuration.BaseCfg;

-import com.nis.domain.configuration.BaseIpCfg;

-import com.nis.domain.configuration.BaseStringCfg;

 import com.nis.domain.configuration.CfgIndexInfo;

-import com.nis.domain.configuration.CommonStringCfg;

-import com.nis.domain.configuration.ComplexkeywordCfg;

 import com.nis.domain.configuration.DnsIpCfg;

 import com.nis.domain.configuration.DnsResStrategy;

-import com.nis.domain.configuration.FileDigestCfg;

-import com.nis.domain.configuration.HttpBodyCfg;

-import com.nis.domain.configuration.HttpReqHeadCfg;

-import com.nis.domain.configuration.HttpResHeadCfg;

-import com.nis.domain.configuration.HttpUrlCfg;

 import com.nis.domain.configuration.IpPortCfg;

-import com.nis.domain.configuration.NtcSubscribeIdCfg;

 import com.nis.domain.configuration.PxyObjKeyring;

 import com.nis.domain.configuration.PxyObjSpoofingIpPool;

 import com.nis.domain.configuration.PxyObjTrustedCaCert;

@@ -46,24 +27,15 @@ import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.maat.GroupReuseAddBean;

 import com.nis.domain.maat.GroupReuseCfg;

 import com.nis.domain.maat.MaatCfg;

-import com.nis.domain.maat.MaatCfg.DigestCfg;

-import com.nis.domain.maat.MaatCfg.GroupCfg;

 import com.nis.domain.maat.MaatCfg.IpCfg;

-import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;

-import com.nis.domain.maat.MaatCfg.StringCfg;

 import com.nis.domain.maat.ToMaatBean;

 import com.nis.domain.maat.ToMaatResult;

-import com.nis.exceptions.MaatConvertException;

 import com.nis.util.ConfigServiceUtil;

 import com.nis.util.Constants;

-import com.nis.util.DateUtils;

-import com.nis.util.FileUtils;

 import com.nis.util.StringUtil;

-import com.nis.web.dao.configuration.AreaIpCfgDao;

 import com.nis.web.dao.configuration.CommonPolicyDao;

 import com.nis.web.dao.configuration.ConfigSynchronizationDao;

 import com.nis.web.dao.configuration.PxyObjSpoofingIpPoolDao;

-import com.nis.web.dao.configuration.StringCfgDao;

 import com.nis.web.dao.configuration.WebsiteCfgDao;

 import com.nis.web.security.UserUtils;

 import com.nis.web.service.BaseService;

@@ -315,7 +287,8 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 		long start=System.currentTimeMillis();

 		long end=System.currentTimeMillis();

 		if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) {

-			commonPolicyDao.auditCfgBatch( "cfg_index_info", entity,compileIds,null);

+			commonPolicyDao.auditCfgBatch("cfg_index_info", entity,compileIds,null);

+			commonPolicyDao.auditCfgBatch("ip_port_cfg", entity,compileIds,null);

 			if(entity.getIsAudit()!=1) {

 				//更新各配置定时任务信息

 				handelScheduleCfg(auditList, entity.getTableName(),entity);

@@ -337,6 +310,60 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 		}

 		

 		if(entity.getIsAudit()==1){

+			// 格式转换 -->

+			if(entity.getServiceId().equals(3)){ // IP Address Drop

+				List<InlineIp> convertList = Lists.newArrayList();

+				for (Object object : notAuditList) {

+					IpPortCfg cfg = (IpPortCfg)object;

+					convertList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));

+				}

+				if(convertList.size() > 0) {

+					notAuditList = convertList;

+				}

+			}else if(entity.getServiceId().equals(65)) { // DNS响应策略

+				List<NtcDnsResStrategy> convertList = Lists.newArrayList();

+				for (Object object : notAuditList) {

+					DnsResStrategy cfg = (DnsResStrategy)object;

+					convertList.add(BaseService.convertCallBackDnsResStrategy(cfg));

+				}

+				if(convertList.size() > 0) {

+					notAuditList = convertList;

+				}

+			}else if(entity.getServiceId().equals(64)) { // DNS欺骗IP

+				List<InlineIp> convertList = Lists.newArrayList();

+				for (Object object : notAuditList) {

+					DnsIpCfg cfg = (DnsIpCfg)object;

+					convertList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));

+				}

+				if(convertList.size() > 0) {

+					notAuditList = convertList;

+				}

+			}else if(entity.getServiceId().equals(520)) { // 证书管理

+				List<ProxyObjKeyring> convertList = Lists.newArrayList();

+				for (Object object : notAuditList) {

+					PxyObjKeyring cfg = (PxyObjKeyring)object;

+					convertList.add(BaseService.convertCallBackProxyObjKeyring(cfg));

+				}

+				if(convertList.size() > 0) {

+					notAuditList = convertList;

+				}

+			}else if(entity.getFunctionId().equals(571)) { // 可信证书颁发机构+证书吊销列表

+				List<ProxyObjTrustedCa> convertList = Lists.newArrayList();

+				for (Object object : notAuditList) {

+					if(object instanceof PxyObjTrustedCaCert) {

+						PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert)object;

+						convertList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));

+					}else if(object instanceof PxyObjTrustedCaCrl) {

+						PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl)object;

+						convertList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg));

+					}

+				}

+				if(convertList.size() > 0) {

+					notAuditList = convertList;

+				}

+			}

+			// 格式转换 -->

+			

 			//调用服务接口下发配置数据

 			String json=gsonToJson(notAuditList);

 			//logger.warn("批量下发配置参数："+json);

@@ -345,6 +372,60 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 			logger.warn("批量下发响应信息："+result.getMsg());

 

 		}else if(entity.getIsAudit()==3){

+			// 格式转换 -->

+			if(entity.getServiceId().equals(3)){ // IP Address Drop

+				List<InlineIp> convertList = Lists.newArrayList();

+				for (Object object : auditList) {

+					IpPortCfg cfg = (IpPortCfg)object;

+					convertList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));

+				}

+				if(convertList.size() > 0) {

+					auditList = convertList;

+				}

+			}else if(entity.getServiceId().equals(65)) { // DNS响应策略

+				List<NtcDnsResStrategy> convertList = Lists.newArrayList();

+				for (Object object : auditList) {

+					DnsResStrategy cfg = (DnsResStrategy)object;

+					convertList.add(BaseService.convertCallBackDnsResStrategy(cfg));

+				}

+				if(convertList.size() > 0) {

+					auditList = convertList;

+				}

+			}else if(entity.getServiceId().equals(64)) { // DNS欺骗IP

+				List<InlineIp> convertList = Lists.newArrayList();

+				for (Object object : auditList) {

+					DnsIpCfg cfg = (DnsIpCfg)object;

+					convertList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));

+				}

+				if(convertList.size() > 0) {

+					auditList = convertList;

+				}

+			}else if(entity.getServiceId().equals(520)) { // 证书管理

+				List<ProxyObjKeyring> convertList = Lists.newArrayList();

+				for (Object object : auditList) {

+					PxyObjKeyring cfg = (PxyObjKeyring)object;

+					convertList.add(BaseService.convertCallBackProxyObjKeyring(cfg));

+				}

+				if(convertList.size() > 0) {

+					auditList = convertList;

+				}

+			}else if(entity.getFunctionId().equals(571)) { // 可信证书颁发机构+证书吊销列表

+				List<ProxyObjTrustedCa> convertList = Lists.newArrayList();

+				for (Object object : auditList) {

+					if(object instanceof PxyObjTrustedCaCert) {

+						PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert)object;

+						convertList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));

+					}else if(object instanceof PxyObjTrustedCaCrl) {

+						PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl)object;

+						convertList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg));

+					}

+				}

+				if(convertList.size() > 0) {

+					auditList = convertList;

+				}

+			}

+			// 格式转换 -->

+			

 			//调用服务接口取消配置

 			String json=gsonToJson(auditList);

 			//logger.warn("批量下发配置参数："+json);