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

修改获取groupid与regionid为批量获取，IP配置协议号不为0并且相同协议IP只生成一条数值域IP即可。

Browse Source
This commit is contained in:
zhangwei
2018-11-19 16:57:29 +08:00
parent 0140a478e2
commit 6f0a31f423
1 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -372,6 +372,7 @@ public abstract class BaseService {
if(cfgType==1){ if(cfgType==1){
List numRegionList = new ArrayList(); List numRegionList = new ArrayList();
Integer groupId = 0; Integer groupId = 0;
Integer numGroupId = 0;
for(T srcCfg:srcList){ for(T srcCfg:srcList){
BaseIpCfg baseIpCfg = new BaseIpCfg(); BaseIpCfg baseIpCfg = new BaseIpCfg();
BeanUtils.copyProperties(srcCfg, baseIpCfg); BeanUtils.copyProperties(srcCfg, baseIpCfg);
@@ -398,8 +399,9 @@ public abstract class BaseService {
} }
dstList.addAll(cfgs); dstList.addAll(cfgs);
//如果protocolId非空非零，需要构造数值型域配置 //如果protocolId非空非零，需要构造数值型域配置，多条相同协议的IP只需要一条数值域配置（目前没有不同协议IP&情况）
if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0){ if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0 ){
if(numGroupId==0){
GroupCfg group1 = new GroupCfg(); GroupCfg group1 = new GroupCfg();
group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
group1.setCompileId(baseIpCfg.getCompileId()); group1.setCompileId(baseIpCfg.getCompileId());
@@ -416,22 +418,26 @@ public abstract class BaseService {
numCfg.setIsValid(baseCfg.getIsValid()); numCfg.setIsValid(baseCfg.getIsValid());
numRegionList.add(numCfg); numRegionList.add(numCfg);
map.put("numRegionList",numRegionList); map.put("numRegionList",numRegionList);
numGroupId++;
}
} }
} }
}else if(cfgType==2 || cfgType==3){ }else if(cfgType==2 || cfgType==3){
List<Integer> groupIdList = ConfigServiceUtil.getId(2, srcList.size());
List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
for(int i=0;i<srcList.size();i++){ for(int i=0;i<srcList.size();i++){
//一条业务配置创建一个分组 //一条业务配置创建一个分组
GroupCfg group = new GroupCfg(); GroupCfg group = new GroupCfg();
StringCfg cfg = new StringCfg(); StringCfg cfg = new StringCfg();
BeanUtils.copyProperties(srcList.get(i), cfg); BeanUtils.copyProperties(srcList.get(i), cfg);
group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); group.setGroupId(groupIdList.get(i));
group.setCompileId(baseCfg.getCompileId()); group.setCompileId(baseCfg.getCompileId());
group.setAuditTime(baseCfg.getAuditTime()); group.setAuditTime(baseCfg.getAuditTime());
group.setIsValid(baseCfg.getIsValid()); group.setIsValid(baseCfg.getIsValid());
groupRelationList.add(group); groupRelationList.add(group);
cfg.setGroupId(group.getGroupId()); cfg.setGroupId(group.getGroupId());
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); cfg.setRegionId(regionIdList.get(i));
cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid()); cfg.setIsValid(baseCfg.getIsValid());
//处理配置关键字转译 //处理配置关键字转译
@@ -441,35 +447,39 @@ public abstract class BaseService {
dstList.add(cfg); dstList.add(cfg);
} }
}else if(cfgType==4){ }else if(cfgType==4){
List<Integer> groupIdList = ConfigServiceUtil.getId(2, srcList.size());
List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
for(int i=0;i<srcList.size();i++){ for(int i=0;i<srcList.size();i++){
//一条业务配置创建一个分组 //一条业务配置创建一个分组
com.nis.domain.maat.MaatCfg.NumBoundaryCfg cfg = new com.nis.domain.maat.MaatCfg.NumBoundaryCfg(); com.nis.domain.maat.MaatCfg.NumBoundaryCfg cfg = new com.nis.domain.maat.MaatCfg.NumBoundaryCfg();
BeanUtils.copyProperties(srcList.get(i), cfg); BeanUtils.copyProperties(srcList.get(i), cfg);
GroupCfg group = new GroupCfg(); GroupCfg group = new GroupCfg();
group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); group.setGroupId(groupIdList.get(i));
group.setCompileId(baseCfg.getCompileId()); group.setCompileId(baseCfg.getCompileId());
group.setAuditTime(baseCfg.getAuditTime()); group.setAuditTime(baseCfg.getAuditTime());
group.setIsValid(baseCfg.getIsValid()); group.setIsValid(baseCfg.getIsValid());
groupRelationList.add(group); groupRelationList.add(group);
cfg.setGroupId(group.getGroupId()); cfg.setGroupId(group.getGroupId());
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); cfg.setRegionId(regionIdList.get(i));
cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid()); cfg.setIsValid(baseCfg.getIsValid());
dstList.add(cfg); dstList.add(cfg);
} }
}else if(cfgType==5){ }else if(cfgType==5){
List<Integer> groupIdList = ConfigServiceUtil.getId(2, srcList.size());
List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
for(int i=0;i<srcList.size();i++){ for(int i=0;i<srcList.size();i++){
//一条业务配置创建一个分组 //一条业务配置创建一个分组
com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg(); com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg();
BeanUtils.copyProperties(srcList.get(i), cfg); BeanUtils.copyProperties(srcList.get(i), cfg);
GroupCfg group = new GroupCfg(); GroupCfg group = new GroupCfg();
group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); group.setGroupId(groupIdList.get(i));
group.setCompileId(baseCfg.getCompileId()); group.setCompileId(baseCfg.getCompileId());
group.setAuditTime(baseCfg.getAuditTime()); group.setAuditTime(baseCfg.getAuditTime());
group.setIsValid(baseCfg.getIsValid()); group.setIsValid(baseCfg.getIsValid());
groupRelationList.add(group); groupRelationList.add(group);
cfg.setGroupId(group.getGroupId()); cfg.setGroupId(group.getGroupId());
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); cfg.setRegionId(regionIdList.get(i));
cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid()); cfg.setIsValid(baseCfg.getIsValid());
dstList.add(cfg); dstList.add(cfg);