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

优化ip配置域的域ID获取逻辑

Browse Source
This commit is contained in:
zhangwei
2018-11-19 18:01:04 +08:00
parent 141f4463a6
commit 6cb6d6bbc2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,7 +373,9 @@ public abstract class BaseService {
List numRegionList = new ArrayList(); List numRegionList = new ArrayList();
Integer groupId = 0; Integer groupId = 0;
Integer numGroupId = 0; Integer numGroupId = 0;
for(T srcCfg:srcList){ List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
for(int i=0;i<srcList.size();i++){
T srcCfg = srcList.get(i);
BaseIpCfg baseIpCfg = new BaseIpCfg(); BaseIpCfg baseIpCfg = new BaseIpCfg();
BeanUtils.copyProperties(srcCfg, baseIpCfg); BeanUtils.copyProperties(srcCfg, baseIpCfg);
IpCfg cfg = new IpCfg(); IpCfg cfg = new IpCfg();
@@ -393,9 +395,12 @@ public abstract class BaseService {
cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid()); cfg.setIsValid(baseCfg.getIsValid());
List<IpCfg> cfgs = ipConvert(cfg,baseIpCfg); List<IpCfg> cfgs = ipConvert(cfg,baseIpCfg);
List<Integer> ids=ConfigServiceUtil.getId(3, cfgs.size()); if(cfgs.size()>1){
for(int i=0;i<cfgs.size();i++) { List<Integer> ids=ConfigServiceUtil.getId(3, cfgs.size()-1);
cfgs.get(i).setRegionId(ids.get(i)); regionIdList.addAll(ids);
}
for(int j=i;j<cfgs.size()+i;j++) {
cfgs.get(j-i).setRegionId(regionIdList.get(j));
} }
dstList.addAll(cfgs); dstList.addAll(cfgs);