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

IP分组部分逻辑提交

Browse Source
This commit is contained in:
wangxin
2019-05-05 15:06:33 +08:00
parent 3f6d6a6d60
commit 68b92c624c
35 changed files with 5081 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.MappedStatement;
@@ -51,6 +52,8 @@ import com.nis.domain.SysRole;
import com.nis.domain.SysUser;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.basics.IpCommCfg;
import com.nis.domain.basics.UrlCommCfg;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.callback.NtcDnsResStrategy;
import com.nis.domain.callback.ProxyObjKeyring;
@@ -1449,12 +1452,67 @@ public abstract class BaseService {
List<IpCfg> cfgs = ipConvert(cfg, baseIpCfg);
maatIpList.addAll(cfgs);
}
} else if(ipCfgList.get(0) instanceof IpCommCfg) {
for (BaseCfg<?> _cfg : ipCfgList) {
IpCfg cfg = new IpCfg();
BaseIpCfg baseIpCfg = new BaseIpCfg();
IpCommCfg ipCommGroupCfg = (IpCommCfg) _cfg;
BeanUtils.copyProperties(ipCommGroupCfg, baseIpCfg);
BeanUtils.copyProperties(baseIpCfg, cfg);
if(groupId==null) {
cfg.setGroupId(ipCommGroupCfg.getGroupId());
}else {
cfg.setGroupId(groupId);
}
cfg.setRegionId(ipCommGroupCfg.getRegionId());
//user regions
//String userRegion = "APP_ID=" + appIpCfg.getAppCode();
//cfg.setUserRegion(userRegion);
cfg.setIsValid(isValid);
cfg.setAuditTime(opTime);
List<IpCfg> cfgs = ipConvert(cfg, baseIpCfg);
maatIpList.addAll(cfgs);
}
}
}
long end = System.currentTimeMillis();
logger.warn("convert data finish,cost:" + (end - start));
return maatIpList;
}
public List<StringCfg> groupReuseStringCfgAddRemoveConvert(List<? extends BaseCfg<?>> stringCfgList, Integer isValid,
Integer groupId) {
logger.warn("convert data start");
long start = System.currentTimeMillis();
Date opTime = new Date();
List<StringCfg> maatStringList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(stringCfgList)) {
// 只用一次instanceof,取代循环中每次都用一次instanceof
if(stringCfgList.get(0) instanceof UrlCommCfg) {
for (BaseCfg<?> _cfg : stringCfgList) {
StringCfg cfg = new StringCfg();
BaseStringCfg baseStringCfg = new BaseStringCfg();
UrlCommCfg ipCommGroupCfg = (UrlCommCfg) _cfg;
BeanUtils.copyProperties(_cfg, baseStringCfg);
BeanUtils.copyProperties(baseStringCfg, cfg);
if(groupId==null) {
cfg.setGroupId(ipCommGroupCfg.getGroupId());
}else {
cfg.setGroupId(groupId);
}
cfg.setRegionId(ipCommGroupCfg.getRegionId());
//user regions
//String userRegion = "APP_ID=" + appIpCfg.getAppCode();
//cfg.setUserRegion(userRegion);
cfg.setIsValid(isValid);
cfg.setAuditTime(opTime);
maatStringList.add(cfg);
}
}
}
long end = System.currentTimeMillis();
logger.warn("convert data finish,cost:" + (end - start));
return maatStringList;
}
public MaatCfg convertMaatCfg(BaseCfg _cfg,Integer cfgType) {
MaatCfg maatCfg = new MaatCfg();
maatCfg.initDefaultValue();