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

(1)app ip 界面IP属性使用function_region_dict控制

Browse Source 
(2)app ip IP复用策略提交
This commit is contained in:
wangxin
2018-09-07 20:18:59 +08:00
parent ecb139bd9a
commit f474a98e50
8 changed files with 314 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.callback.NtcDnsResStrategy;
import com.nis.domain.callback.ProxyObjKeyring;
import com.nis.domain.configuration.AppIpCfg;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg;
@@ -738,16 +739,25 @@ public abstract class BaseService {
return replaceContent;
}
//asn IP 复用转换
public List<IpCfg> groupReuseCfgAddRemoveConvert(List<AsnIpCfg> ipCfgList,Integer isValid) {
public List<IpCfg> groupReuseCfgAddRemoveConvert(List<? extends BaseCfg<?>> ipCfgList,Integer isValid,Integer groupId) {
Date opTime=new Date();
List<IpCfg> maatIpList=new ArrayList<>();
for(AsnIpCfg asnIpCfg:ipCfgList) {
BaseIpCfg baseIpCfg = new BaseIpCfg();
BeanUtils.copyProperties(asnIpCfg, baseIpCfg);
for(BaseCfg<?> _cfg:ipCfgList) {
IpCfg cfg = new IpCfg();
BeanUtils.copyProperties(baseIpCfg, cfg);
cfg.setGroupId(asnIpCfg.getAsnIpGroup());
cfg.setRegionId(asnIpCfg.getRegionId());
BaseIpCfg baseIpCfg = new BaseIpCfg();
if(_cfg instanceof AsnIpCfg) {
AsnIpCfg asnIpCfg=(AsnIpCfg)_cfg;
BeanUtils.copyProperties(asnIpCfg, baseIpCfg);
BeanUtils.copyProperties(baseIpCfg, cfg);
cfg.setGroupId(asnIpCfg.getAsnIpGroup());
cfg.setRegionId(asnIpCfg.getRegionId());
}else if(_cfg instanceof AppIpCfg) {
AppIpCfg appIpCfg=(AppIpCfg)_cfg;
BeanUtils.copyProperties(appIpCfg, baseIpCfg);
BeanUtils.copyProperties(baseIpCfg, cfg);
cfg.setGroupId(groupId);
cfg.setRegionId(Integer.parseInt(appIpCfg.getUserRegion1()));
}
cfg.setIsValid(isValid);
cfg = ipConvert(cfg,baseIpCfg);
cfg.setAuditTime(opTime);