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

ASN ip，APP特征业务的配置批量取消功能完成

Browse Source
This commit is contained in:
段冬梅
2019-03-11 17:06:31 +08:00
parent c8e43c81f1
commit 785150f921
8 changed files with 241 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
View File

@@ -8,6 +8,7 @@ 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;
@@ -18,6 +19,7 @@ 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;
@@ -40,6 +42,8 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
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;
@@ -88,6 +92,8 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
BaseCfg entity,
List<BaseCfg> list,
boolean hasData)throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
long start=System.currentTimeMillis();
long end=System.currentTimeMillis();
ToMaatBean maatBean;
MaatCfg maatCfg;
List<MaatCfg> configCompileList;
@@ -160,11 +166,15 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
//调用服务接口取消配置
String json=gsonToJson(maatBean);
if(StringUtil.isEmpty(list)) {
logger.info("批量配置取消个数："+list.size());
logger.info("批量配置取消（"+page.getPageNo()+"次）个数："+list.size());
}
//调用服务接口下发配置
logger.info("Maat配置批量失效-下发：start()");
start=System.currentTimeMillis();
ToMaatResult result = ConfigServiceUtil.put(json,1);
end=System.currentTimeMillis();
logger.info("配置取消配置响应信息："+result.getMsg());
logger.info("Maat配置批量失效-下发：end("+(end-start)+")");
}
return hasData;
}
@@ -177,6 +187,78 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgListByCertId(List certIds){
return synchronizationDao.getPxyObjTrustedCrlCfgListByCertId(certIds);
}
/**
* IP复用配置取消
* @param cfgList
* @param page
* @param auditMap
* @param hasData
* @return
*/
public boolean auditReuseConfigData(
Page page,
BaseCfg entity,
Map<Integer, List> auditMap,
boolean hasData){
long start=System.currentTimeMillis();
long end=System.currentTimeMillis();
long totolSize=0;
if(page.isLastPage()){
hasData = false;
}
List<Integer> regionIds = new ArrayList();
for(Entry<Integer, List> e:auditMap.entrySet()) {
List<BaseCfg> list=e.getValue();
for (BaseCfg baseCfg : list) {
if("asn_ip_cfg".equals(entity.getTableName())) {
regionIds.add(baseCfg.getRegionId());
}else {
regionIds.add(Integer.parseInt(baseCfg.getUserRegion1()));
}
}
totolSize=totolSize+list.size();
}
start=System.currentTimeMillis();
logger.info("APP IP配置批量失效-数据库状态变更：start()");
commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,regionIds,null);
end=System.currentTimeMillis();
logger.info("APP IP配置批量失效-数据库状态变更：end("+(end-start)+")");
//已经下发过的,调用分组复用配置删除接口
if(!auditMap.isEmpty()) {
GroupReuseAddBean maatBean = new GroupReuseAddBean();
List<GroupReuseCfg> groupReuseList=new ArrayList<>();
GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
List<IpCfg> ipRegionList=new ArrayList<>();
for (Integer groupId : auditMap.keySet()) {
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(auditMap.get(groupId),Constants.VALID_NO,groupId));
}
groupReuseCfg.setIpRegionList(ipRegionList);
groupReuseCfg.setStrRegionList(null);
groupReuseCfg.setNumRegionList(null);
groupReuseList.add(groupReuseCfg);
maatBean.setGroupReuseCfgList(groupReuseList);
maatBean.setAuditTime(new Date());
maatBean.setCreatorName(UserUtils.getUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.UPDATE_ACTION);
//调用服务接口下发配置数据
String json=gsonToJson(maatBean);
logger.info("app协议IP域配置批量取消（"+page.getPageNo()+"次）："+ipRegionList.size());
//logger.info("app协议IP域配置批量取消："+json);
//调用服务接口下发配置
logger.info("APP IP配置批量失效-下发：start()");
start=System.currentTimeMillis();
ToMaatResult result = ConfigServiceUtil.put(json,3);
end=System.currentTimeMillis();
logger.info("app协议IP域配置批量取消响应信息："+result.getMsg());
logger.info("APP IP配置批量失效-下发：end("+(end-start)+")");
}
return hasData;
}
/**
* 回调类配置下发
* @param className