diff --git a/src/main/java/com/nis/domain/maat/GroupReuseCfg.java b/src/main/java/com/nis/domain/maat/GroupReuseCfg.java index 2ad349667..dbc391446 100644 --- a/src/main/java/com/nis/domain/maat/GroupReuseCfg.java +++ b/src/main/java/com/nis/domain/maat/GroupReuseCfg.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.List; 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.NumBoundaryCfg; import com.nis.domain.maat.MaatCfg.StringCfg; @@ -13,7 +14,15 @@ import com.nis.domain.maat.MaatCfg.StringCfg; * */ public class GroupReuseCfg implements Serializable { - + @Expose + @SerializedName("service") + private Integer serviceId; + public Integer getServiceId() { + return serviceId; + } + public void setServiceId(Integer serviceId) { + this.serviceId = serviceId; + } /** * */ diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java index 0a3074b87..f0a091425 100644 --- a/src/main/java/com/nis/domain/maat/MaatCfg.java +++ b/src/main/java/com/nis/domain/maat/MaatCfg.java @@ -258,6 +258,15 @@ public class MaatCfg implements Serializable { @Expose @SerializedName("opTime") private Date auditTime; + @Expose + private String userRegion; + + public String getUserRegion() { + return userRegion; + } + public void setUserRegion(String userRegion) { + this.userRegion = userRegion; + } public Integer getRegionId() { return regionId; } diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 2abc62f55..3748aad8f 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -758,6 +758,8 @@ public abstract class BaseService { BeanUtils.copyProperties(baseIpCfg, cfg); cfg.setGroupId(groupId); cfg.setRegionId(Integer.parseInt(appIpCfg.getUserRegion1())); + String userRegion = "APP_ID=" + appIpCfg.getAppCode(); + cfg.setUserRegion(userRegion); } cfg.setIsValid(isValid); cfg = ipConvert(cfg,baseIpCfg); diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index 757563c73..f7fc73433 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -1161,6 +1161,8 @@ public class AppCfgService extends BaseService { GroupReuseAddBean maatBean = new GroupReuseAddBean(); List groupReuseList=new ArrayList<>(); GroupReuseCfg groupReuseCfg=new GroupReuseCfg(); + /*groupReuseCfg.setUserRegion(userRegion);*/ + groupReuseCfg.setServiceId(entitys.get(0).getServiceId()); ipRegionList.addAll(groupReuseCfgAddRemoveConvert(entitys,Constants.VALID_YES,groupId)); groupReuseCfg.setIpRegionList(ipRegionList); groupReuseCfg.setStrRegionList(strRegionList);