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

导入并下发ip region时其附带的数值域的group id改为跟ip域一致

Browse Source
This commit is contained in:
wangxin
2018-11-21 14:08:12 +08:00
parent 6bbb2b6038
commit f5e3b17761
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -230,15 +230,15 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
protected Integer groupId;//仅用于copy属性使用 protected Integer groupId;//仅用于copy属性使用
protected Integer regionId;//仅用于copy属性使用 protected Integer regionId;//仅用于copy属性使用
protected Integer numberRegionGroupId;//仅用于copy属性使用 // protected Integer numberRegionGroupId;//仅用于copy属性使用
protected Integer numberRegionRegionId;//仅用于copy属性使用 protected Integer numberRegionRegionId;//仅用于copy属性使用
public Integer getNumberRegionGroupId() { // public Integer getNumberRegionGroupId() {
return numberRegionGroupId; // return numberRegionGroupId;
} // }
public void setNumberRegionGroupId(Integer numberRegionGroupId) { // public void setNumberRegionGroupId(Integer numberRegionGroupId) {
this.numberRegionGroupId = numberRegionGroupId; // this.numberRegionGroupId = numberRegionGroupId;
} // }
public Integer getNumberRegionRegionId() { public Integer getNumberRegionRegionId() {
return numberRegionRegionId; return numberRegionRegionId;
} }

10
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -1417,7 +1417,7 @@ public class BaseController {
List<Integer> compileIds=Lists.newArrayList(); List<Integer> compileIds=Lists.newArrayList();
List<Integer> regionIds=Lists.newArrayList(); List<Integer> regionIds=Lists.newArrayList();
List<Integer> groupIds=Lists.newArrayList(); List<Integer> groupIds=Lists.newArrayList();
List<Integer> numRegionGroupIds=Lists.newArrayList(); // List<Integer> numRegionGroupIds=Lists.newArrayList();
List<Integer> numRegionRegionIds=Lists.newArrayList(); List<Integer> numRegionRegionIds=Lists.newArrayList();
if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取 if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取
try { try {
@@ -1428,7 +1428,7 @@ public class BaseController {
} }
//需要获取数值域的id //需要获取数值域的id
if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { if(serviceDict!=null&&serviceDict.getProtocolId()!=null) {
numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); // numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
} }
} catch (Exception e) { } catch (Exception e) {
@@ -1468,9 +1468,9 @@ public class BaseController {
cfg.setRegionId(regionIds.get(ind)); cfg.setRegionId(regionIds.get(ind));
} }
if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { if(serviceDict!=null&&serviceDict.getProtocolId()!=null) {
if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { // if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) {
cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); // cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind));
} // }
if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) { if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) {
cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind)); cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind));
} }

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

@@ -597,11 +597,7 @@ public abstract class BaseService {
if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) { if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) {
if (numGroupId == 0) { if (numGroupId == 0) {
GroupCfg group1 = new GroupCfg(); GroupCfg group1 = new GroupCfg();
if(baseIpCfg.getNumberRegionGroupId()!=null) { group1.setGroupId(groupId);
group1.setGroupId(baseIpCfg.getNumberRegionGroupId());
}else {
group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
}
group1.setCompileId(baseIpCfg.getCompileId()); group1.setCompileId(baseIpCfg.getCompileId());
group1.setAuditTime(baseIpCfg.getAuditTime()); group1.setAuditTime(baseIpCfg.getAuditTime());
group1.setIsValid(baseIpCfg.getIsValid()); group1.setIsValid(baseIpCfg.getIsValid());