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

同一业务，多个ip域为或的关系，共用一个groupId

Browse Source 
例：同一compileId多个区域IP，多个区域IP或满足
This commit is contained in:
duandongmei
2018-06-08 11:02:26 +08:00
parent c8ed5c1918
commit 765d9a9ced
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,19 +278,20 @@ public abstract class BaseService {
List numRegionList = new ArrayList(); List numRegionList = new ArrayList();
Integer groupId = 0; Integer groupId = 0;
for(int i=0;i<srcList.size();i++){ for(int i=0;i<srcList.size();i++){
GroupCfg group = new GroupCfg();
BaseIpCfg baseIpCfg = (BaseIpCfg) srcList.get(i); BaseIpCfg baseIpCfg = (BaseIpCfg) srcList.get(i);
IpCfg cfg = new IpCfg(); IpCfg cfg = new IpCfg();
BeanUtils.copyProperties(baseIpCfg, cfg); BeanUtils.copyProperties(baseIpCfg, cfg);
GroupCfg group = new GroupCfg();
if(!cfg.getCfgType().equals(regionValue)){ if(!cfg.getCfgType().equals(regionValue)){
group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); groupId = ConfigServiceUtil.getId(2, 1).get(0);
group.setGroupId(groupId);
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(groupId);
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid()); cfg.setIsValid(baseCfg.getIsValid());