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

修改IP配置导入审核 获取numRegionGroupId.

Browse Source
This commit is contained in:
zhangwenqing
2018-12-21 17:07:22 +08:00
parent 7c6965633b
commit 34e243fb3b
4 changed files with 19 additions and 14 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

@@ -264,15 +264,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

@@ -1507,7 +1507,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 {
@@ -1517,7 +1517,7 @@ public class BaseController {
regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
//需要获取数值域的id //需要获取数值域的id
if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) { if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) {
// numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
} }
} }
@@ -1558,9 +1558,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));
} }

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

@@ -600,7 +600,12 @@ 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();
group1.setGroupId(groupId); //group1.setGroupId(groupId);
if(baseIpCfg.getNumberRegionGroupId()!=null) {
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());

2
src/main/webapp/static/pages/scripts/importExcel.js
View File

@@ -20,7 +20,7 @@ $(function(){
if($(".requestIdSel").hasClass("hidden")){ if($(".requestIdSel").hasClass("hidden")){
$(".attributeSel").addClass("hidden"); $(".attributeSel").addClass("hidden");
$(".classifySel").addClass("hidden"); $(".classifySel").addClass("hidden");
$("select[name='requestId']").empty();
if($(".appSelDiv").length == 0){ if($(".appSelDiv").length == 0){
// 新增文件div上移 // 新增文件div上移
var fileDiv = $(".fileSelDiv").clone(); var fileDiv = $(".fileSelDiv").clone();