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

批量下发时，之下发未下发的asnip。无未下发的asnip，需要下发compile和group

Browse Source
This commit is contained in:
DuanDongmei
2018-12-01 20:21:30 +08:00
parent c69ed65620
commit ac5e519e39
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -264,7 +264,11 @@ public class ConfigSynchronizationService extends BaseService{
if("1".equals(m.get("cfgType"))){
if(tableName.equals("asn_ip_cfg")){
if(!StringUtil.isEmpty(asnGroupIds)) {
asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds));
if(isUpdateCfg) { //批量审核时只查询未下发的asnip
asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds,0));
}else { //全量下发时需要检索所有asnip
asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds,null));
}
}
}else{
ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds));
@@ -361,6 +365,7 @@ public class ConfigSynchronizationService extends BaseService{
list1.add(ip);
}
}
if(list1.size()>0){
GroupCfg groupCfg=new GroupCfg();
groupCfg.setCompileId(cfg.getCompileId());
@@ -369,6 +374,14 @@ public class ConfigSynchronizationService extends BaseService{
groupCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
groupRelationList.add(groupCfg);
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null));
}else if(!StringUtil.isEmpty(asnGroupIds)) {
GroupCfg groupCfg=new GroupCfg();
groupCfg.setCompileId(cfg.getCompileId());
groupCfg.setGroupId(Integer.parseInt(cfg.getUserRegion4()));
groupCfg.setIsValid(entity.getIsValid());
groupCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
groupRelationList.add(groupCfg);
ipRegionList.addAll(ipRegionList);
}
//配置域转换
configCovert(ipList,strList,complexStrList,