app ip分组复用新增两个属性(1)service,用于综合服务判断app ip业务;(1)userRegion,用于传入APP_ID
This commit is contained in:
@@ -4,6 +4,7 @@ import java.io.Serializable;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
import com.nis.domain.maat.MaatCfg.IpCfg;
|
import com.nis.domain.maat.MaatCfg.IpCfg;
|
||||||
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
|
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
|
||||||
import com.nis.domain.maat.MaatCfg.StringCfg;
|
import com.nis.domain.maat.MaatCfg.StringCfg;
|
||||||
@@ -13,7 +14,15 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class GroupReuseCfg implements Serializable {
|
public class GroupReuseCfg implements Serializable {
|
||||||
|
@Expose
|
||||||
|
@SerializedName("service")
|
||||||
|
private Integer serviceId;
|
||||||
|
public Integer getServiceId() {
|
||||||
|
return serviceId;
|
||||||
|
}
|
||||||
|
public void setServiceId(Integer serviceId) {
|
||||||
|
this.serviceId = serviceId;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -258,6 +258,15 @@ public class MaatCfg implements Serializable {
|
|||||||
@Expose
|
@Expose
|
||||||
@SerializedName("opTime")
|
@SerializedName("opTime")
|
||||||
private Date auditTime;
|
private Date auditTime;
|
||||||
|
@Expose
|
||||||
|
private String userRegion;
|
||||||
|
|
||||||
|
public String getUserRegion() {
|
||||||
|
return userRegion;
|
||||||
|
}
|
||||||
|
public void setUserRegion(String userRegion) {
|
||||||
|
this.userRegion = userRegion;
|
||||||
|
}
|
||||||
public Integer getRegionId() {
|
public Integer getRegionId() {
|
||||||
return regionId;
|
return regionId;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -758,6 +758,8 @@ public abstract class BaseService {
|
|||||||
BeanUtils.copyProperties(baseIpCfg, cfg);
|
BeanUtils.copyProperties(baseIpCfg, cfg);
|
||||||
cfg.setGroupId(groupId);
|
cfg.setGroupId(groupId);
|
||||||
cfg.setRegionId(Integer.parseInt(appIpCfg.getUserRegion1()));
|
cfg.setRegionId(Integer.parseInt(appIpCfg.getUserRegion1()));
|
||||||
|
String userRegion = "APP_ID=" + appIpCfg.getAppCode();
|
||||||
|
cfg.setUserRegion(userRegion);
|
||||||
}
|
}
|
||||||
cfg.setIsValid(isValid);
|
cfg.setIsValid(isValid);
|
||||||
cfg = ipConvert(cfg,baseIpCfg);
|
cfg = ipConvert(cfg,baseIpCfg);
|
||||||
|
|||||||
@@ -1161,6 +1161,8 @@ public class AppCfgService extends BaseService {
|
|||||||
GroupReuseAddBean maatBean = new GroupReuseAddBean();
|
GroupReuseAddBean maatBean = new GroupReuseAddBean();
|
||||||
List<GroupReuseCfg> groupReuseList=new ArrayList<>();
|
List<GroupReuseCfg> groupReuseList=new ArrayList<>();
|
||||||
GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
|
GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
|
||||||
|
/*groupReuseCfg.setUserRegion(userRegion);*/
|
||||||
|
groupReuseCfg.setServiceId(entitys.get(0).getServiceId());
|
||||||
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(entitys,Constants.VALID_YES,groupId));
|
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(entitys,Constants.VALID_YES,groupId));
|
||||||
groupReuseCfg.setIpRegionList(ipRegionList);
|
groupReuseCfg.setIpRegionList(ipRegionList);
|
||||||
groupReuseCfg.setStrRegionList(strRegionList);
|
groupReuseCfg.setStrRegionList(strRegionList);
|
||||||
|
|||||||
Reference in New Issue
Block a user