各业务配置批量下发功能提交
This commit is contained in:
段冬梅
@@ -3095,171 +3095,152 @@ public class BaseController {
|
||||
}else{
|
||||
//400 ASN IP
|
||||
if(auditBatchCfg.getServiceId().equals(400)) {
|
||||
//所有已下发的ASN IP组
|
||||
boolean hasData = true;
|
||||
while(hasData){
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(false);
|
||||
//已下发的ASN IP
|
||||
List<AsnIpCfg> list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList();
|
||||
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
if(auditBatchCfg.getIsValid().equals(1)) {
|
||||
if(auditBatchCfg.getIsValid() == 1) {
|
||||
boolean hasData = true;
|
||||
//批量生效[按每组每批次下发一次]
|
||||
AsnGroupInfo groupInfo=new AsnGroupInfo();
|
||||
if(!StringUtil.isEmpty(searchAsnIpCfg.getUserRegion1())) {
|
||||
groupInfo.setAsnId(Long.valueOf(searchAsnIpCfg.getUserRegion1()));
|
||||
}
|
||||
List<AsnGroupInfo> asnGroupInfos=asnGroupInfoService.findAsnGroupInfoList(groupInfo);
|
||||
if(StringUtil.isEmpty(asnGroupInfos)){
|
||||
hasData=false;
|
||||
}
|
||||
while(hasData){
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(true);
|
||||
page.setPageSize(-1);
|
||||
auditBatchCfg.setCompileIsIssued(asnGroupInfos.get(0).getIsValid());
|
||||
auditBatchCfg.setCompileId(asnGroupInfos.get(0).getCompileId());
|
||||
auditBatchCfg.setGroupId(asnGroupInfos.get(0).getGroupId());
|
||||
searchAsnIpCfg.setAsnIpGroup(asnGroupInfos.get(0).getGroupId());
|
||||
List list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList();
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
configSynchronizationService.auditAsnIpData(null, page, auditBatchCfg, list, hasData,true);
|
||||
}
|
||||
if(!StringUtil.isEmpty(asnGroupInfos)) {
|
||||
asnGroupInfos.remove(0);
|
||||
}
|
||||
if(asnGroupInfos.size() > 0) {
|
||||
hasData=true;
|
||||
}else {
|
||||
Map<Integer,List> asnIpMap=new HashMap();
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
for (AsnIpCfg obj : list) {
|
||||
BaseCfg baseCfg=(BaseCfg)obj;
|
||||
if(!StringUtil.isEmpty(asnIpMap.get(obj.getAsnIpGroup()))) {
|
||||
asnIpMap.get(obj.getAsnIpGroup()).add(baseCfg);
|
||||
asnIpMap.put(obj.getAsnIpGroup(), asnIpMap.get(obj.getAsnIpGroup()));
|
||||
}else {
|
||||
List newList=new ArrayList<>();
|
||||
newList.add(baseCfg);
|
||||
asnIpMap.put(obj.getAsnIpGroup(),newList);
|
||||
hasData=false;
|
||||
}
|
||||
}
|
||||
}else {
|
||||
//所有已下发的ASN IP组
|
||||
boolean hasData = true;
|
||||
while(hasData){
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(false);
|
||||
//已下发的ASN IP
|
||||
List<AsnIpCfg> list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList();
|
||||
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
if(auditBatchCfg.getIsValid().equals(1)) {
|
||||
}else {
|
||||
Map<Integer,List> asnIpMap=new HashMap();
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
for (AsnIpCfg obj : list) {
|
||||
BaseCfg baseCfg=(BaseCfg)obj;
|
||||
if(!StringUtil.isEmpty(asnIpMap.get(obj.getAsnIpGroup()))) {
|
||||
asnIpMap.get(obj.getAsnIpGroup()).add(baseCfg);
|
||||
asnIpMap.put(obj.getAsnIpGroup(), asnIpMap.get(obj.getAsnIpGroup()));
|
||||
}else {
|
||||
List newList=new ArrayList<>();
|
||||
newList.add(baseCfg);
|
||||
asnIpMap.put(obj.getAsnIpGroup(),newList);
|
||||
}
|
||||
}
|
||||
}
|
||||
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData);
|
||||
}
|
||||
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData);
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
}
|
||||
}else if(auditBatchCfg.getServiceId().equals(1028)) {
|
||||
//所有已下发的app IP组
|
||||
ConfigGroupInfo groupInfo=new ConfigGroupInfo();
|
||||
groupInfo.setIsIssued(1);
|
||||
groupInfo.setGroupType(1);//1:app ip
|
||||
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(groupInfo);
|
||||
Map<Integer,Integer> groupMap=new HashMap<>();
|
||||
for (ConfigGroupInfo configGroupInfo : groupInfos) {
|
||||
groupMap.put(configGroupInfo.getCompileId(), configGroupInfo.getGroupId());
|
||||
}
|
||||
|
||||
boolean hasData = true;
|
||||
while(hasData){
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(false);
|
||||
|
||||
//已下发的APP IP
|
||||
List<AppIpCfg> list=appCfgService.findAppIpList(page, searchAppIpCfg).getList();
|
||||
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
if(auditBatchCfg.getIsValid().equals(1)) {
|
||||
//TODO 批量审核通过APP IP需要处理的问题：一批中存在一个APP 所有IP均未下发过的问题？待解决
|
||||
//批量下发时，未下发过的app需要下发正常配置;已下发过的app需要下发ip复用配置（为保证事物，分两种方式下发）
|
||||
/*hasData=configSynchronizationService.auditDdosMaatData(cfgList,userRegionList,
|
||||
page,auditBatchCfg,list,hasData,true);*/
|
||||
if(auditBatchCfg.getIsValid() == 1) {
|
||||
boolean hasData = true;
|
||||
//批量生效[按每组每批次下发一次]
|
||||
ConfigGroupInfo groupInfo=new ConfigGroupInfo();
|
||||
groupInfo.setGroupType(1);//1:app ip
|
||||
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(groupInfo);
|
||||
if(StringUtil.isEmpty(groupInfos)){
|
||||
hasData=false;
|
||||
}
|
||||
while(hasData){
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(true);
|
||||
page.setPageSize(-1);
|
||||
auditBatchCfg.setCompileIsIssued(groupInfos.get(0).getIsIssued());
|
||||
auditBatchCfg.setCompileId(groupInfos.get(0).getCompileId());
|
||||
auditBatchCfg.setGroupId(groupInfos.get(0).getGroupId());
|
||||
searchAppIpCfg.setCompileId(groupInfos.get(0).getCompileId());;
|
||||
List list=appCfgService.findAppIpList(searchAppIpCfg);
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
configSynchronizationService.auditAppIpData(null, page, auditBatchCfg, list, hasData,true);
|
||||
}
|
||||
if(!StringUtil.isEmpty(groupInfos)) {
|
||||
groupInfos.remove(0);
|
||||
}
|
||||
if(groupInfos.size() > 0) {
|
||||
hasData=true;
|
||||
}else {
|
||||
Map<Integer,List> appIpMap=new HashMap();
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
for (AppIpCfg obj : list) {
|
||||
BaseCfg baseCfg=(BaseCfg)obj;
|
||||
if(!StringUtil.isEmpty(appIpMap.get((groupMap.get(obj.getCompileId()))))) {
|
||||
appIpMap.get(groupMap.get(obj.getCompileId())).add(baseCfg);
|
||||
appIpMap.put(groupMap.get(obj.getCompileId()), appIpMap.get(groupMap.get(obj.getCompileId())));
|
||||
}else {
|
||||
List newList=new ArrayList<>();
|
||||
newList.add(baseCfg);
|
||||
appIpMap.put(groupMap.get(obj.getCompileId()),newList);
|
||||
hasData=false;
|
||||
}
|
||||
}
|
||||
}else {
|
||||
//所有已下发的app IP组
|
||||
ConfigGroupInfo groupInfo=new ConfigGroupInfo();
|
||||
groupInfo.setIsIssued(1);
|
||||
groupInfo.setGroupType(1);//1:app ip
|
||||
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(groupInfo);
|
||||
Map<Integer,Integer> groupMap=new HashMap<>();
|
||||
for (ConfigGroupInfo configGroupInfo : groupInfos) {
|
||||
groupMap.put(configGroupInfo.getCompileId(), configGroupInfo.getGroupId());
|
||||
}
|
||||
|
||||
boolean hasData = true;
|
||||
while(hasData){
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(false);
|
||||
|
||||
//已下发的APP IP
|
||||
List<AppIpCfg> list=appCfgService.findAppIpList(page, searchAppIpCfg).getList();
|
||||
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
if(auditBatchCfg.getIsValid().equals(1)) {
|
||||
//TODO 批量审核通过APP IP需要处理的问题：一批中存在一个APP 所有IP均未下发过的问题？待解决
|
||||
//先查询所有的asn group，在根据asn group 查询所有未下发的asn ip
|
||||
|
||||
//批量下发时，未下发过的app需要下发正常配置;已下发过的app需要下发ip复用配置（为保证事物，分两种方式下发）
|
||||
/*hasData=configSynchronizationService.auditDdosMaatData(cfgList,userRegionList,
|
||||
page,auditBatchCfg,list,hasData,true);*/
|
||||
|
||||
}else {
|
||||
Map<Integer,List> appIpMap=new HashMap();
|
||||
if(!StringUtil.isEmpty(list)) {
|
||||
for (AppIpCfg obj : list) {
|
||||
BaseCfg baseCfg=(BaseCfg)obj;
|
||||
if(!StringUtil.isEmpty(appIpMap.get((groupMap.get(obj.getCompileId()))))) {
|
||||
appIpMap.get(groupMap.get(obj.getCompileId())).add(baseCfg);
|
||||
appIpMap.put(groupMap.get(obj.getCompileId()), appIpMap.get(groupMap.get(obj.getCompileId())));
|
||||
}else {
|
||||
List newList=new ArrayList<>();
|
||||
newList.add(baseCfg);
|
||||
appIpMap.put(groupMap.get(obj.getCompileId()),newList);
|
||||
}
|
||||
}
|
||||
}
|
||||
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,appIpMap,hasData);
|
||||
}
|
||||
hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,appIpMap,hasData);
|
||||
}
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*if(true) {
|
||||
page.setOrderBy("");
|
||||
page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(false);
|
||||
|
||||
boolean hasData = true;
|
||||
while(hasData){
|
||||
*//************预先获取已下发的groupid和compileid，且每批次重新获取，避免上一批次有新的compileId下发*************//*
|
||||
Map<Integer, Integer> isIssuedCompileIds=new HashMap<>();
|
||||
//分组复用组信息1:app ip，2：内容，3：区域 ,4 asn
|
||||
ConfigGroupInfo groupInfo=new ConfigGroupInfo();
|
||||
groupInfo.setIsIssued(1);
|
||||
groupInfo.setGroupType(1);
|
||||
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(groupInfo);//每一批次下发都取一次最新的group_info信息
|
||||
Map<Integer, Integer> compileGroups=new HashMap<>();
|
||||
if(!StringUtil.isEmpty(groupInfos)) {
|
||||
for (ConfigGroupInfo configGroupInfo : groupInfos) {
|
||||
isIssuedCompileIds.put(configGroupInfo.getCompileId(), configGroupInfo.getGroupId());
|
||||
}
|
||||
}
|
||||
if(!StringUtil.isEmpty(isIssuedCompileIds)) {
|
||||
auditBatchCfg.setCompileGroupMap(isIssuedCompileIds);
|
||||
auditBatchCfg.setCompileIsIssued(1);
|
||||
List list = Lists.newArrayList();
|
||||
searchAppIpCfg.setCompileGroupMap(isIssuedCompileIds);
|
||||
list=appCfgService.findAppIpList(page, searchAppIpCfg).getList();
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
//APP IP配置生效/失效
|
||||
hasData=configSynchronizationService.auditAppIpData(userRegionList,
|
||||
page,auditBatchCfg,list,hasData,true);
|
||||
if(hasData) {
|
||||
page.setPageNo(page.getNext());
|
||||
}
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
}else {
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(auditBatchCfg.getIsValid().equals(1)) {
|
||||
page.setOrderBy("");
|
||||
page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
|
||||
page.setPageNo(1);
|
||||
page.setLastPage(false);
|
||||
|
||||
boolean hasData = true;
|
||||
while(hasData){
|
||||
*//************预先获取未下发的groupid和compileid，********************//*
|
||||
//获取已下发的appcompileid
|
||||
Map<Integer, Integer> notIssuedCompileIds=new HashMap<>();
|
||||
//分组复用组信息1:app ip，2：内容，3：区域 ,4 asn
|
||||
ConfigGroupInfo groupInfo=new ConfigGroupInfo();
|
||||
groupInfo.setIsIssued(0);
|
||||
groupInfo.setGroupType(1);
|
||||
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(groupInfo);//每一批次下发都取一次最新的group_info信息
|
||||
Map<Integer, Integer> compileGroups=new HashMap<>();
|
||||
if(!StringUtil.isEmpty(groupInfos)) {
|
||||
for (ConfigGroupInfo configGroupInfo : groupInfos) {
|
||||
notIssuedCompileIds.put(configGroupInfo.getCompileId(), configGroupInfo.getGroupId());
|
||||
}
|
||||
}
|
||||
if(!StringUtil.isEmpty(notIssuedCompileIds)) {
|
||||
auditBatchCfg.setCompileGroupMap(notIssuedCompileIds);
|
||||
searchAppIpCfg.setCompileGroupMap(notIssuedCompileIds);
|
||||
auditBatchCfg.setCompileIsIssued(0);
|
||||
List list = Lists.newArrayList();
|
||||
list=appCfgService.findAppIpList(page, searchAppIpCfg).getList();
|
||||
if(!StringUtil.isEmpty(list)){
|
||||
//APP IP配置生效/失效
|
||||
hasData=configSynchronizationService.auditAppIpData(userRegionList,
|
||||
page,auditBatchCfg,list,hasData,true);
|
||||
if(hasData) {
|
||||
page.setPageNo(page.getNext());
|
||||
}
|
||||
}else{
|
||||
hasData = false;
|
||||
}
|
||||
}else {
|
||||
hasData = false;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}else {
|
||||
boolean hasData = true;
|
||||
while(hasData){
|
||||
|
||||
Reference in New Issue
Block a user