修复IP配置为空的时候审核报错的bug
This commit is contained in:
wangxin
@@ -859,85 +859,88 @@ public class MultipleCfgController extends BaseController{
|
||||
searchIpCfg.setCompileId(compileId);
|
||||
//根据表名，编译ID查询唯一结果
|
||||
BaseIpCfg resultIpCfg=ipCfgService.get(searchIpCfg);
|
||||
searchIpCfg.setAuditorId(searchIpCfg.getCurrentUser().getId());
|
||||
searchIpCfg.setAuditTime(date);
|
||||
searchIpCfg.setCfgId(resultIpCfg.getCfgId());
|
||||
searchIpCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchIpCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultIpCfg!=null){
|
||||
resultIpCfg.setIsValid(Constants.VALID_NO);
|
||||
resultIpCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchIpCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultIpCfg!=null){
|
||||
resultIpCfg.setIsValid(Constants.VALID_YES);
|
||||
resultIpCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getIpCfg()==null){
|
||||
Map<String,BaseIpCfg> map=new HashMap<String,BaseIpCfg>();
|
||||
map.put(tableName, searchIpCfg);
|
||||
searchCfg.setIpCfg(map);
|
||||
}else{
|
||||
Map<String,BaseIpCfg> map=searchCfg.getIpCfg();
|
||||
map.put(tableName, searchIpCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultIpCfg!=null){
|
||||
if(resultCfg.getIpCfg()==null){
|
||||
searchIpCfg.setAuditorId(searchIpCfg.getCurrentUser().getId());
|
||||
searchIpCfg.setAuditTime(date);
|
||||
searchIpCfg.setCfgId(resultIpCfg.getCfgId());
|
||||
searchIpCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchIpCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultIpCfg!=null){
|
||||
resultIpCfg.setIsValid(Constants.VALID_NO);
|
||||
resultIpCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchIpCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultIpCfg!=null){
|
||||
resultIpCfg.setIsValid(Constants.VALID_YES);
|
||||
resultIpCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getIpCfg()==null){
|
||||
Map<String,BaseIpCfg> map=new HashMap<String,BaseIpCfg>();
|
||||
map.put(tableName, resultIpCfg);
|
||||
resultCfg.setIpCfg(map);
|
||||
map.put(tableName, searchIpCfg);
|
||||
searchCfg.setIpCfg(map);
|
||||
}else{
|
||||
Map<String,BaseIpCfg> map=resultCfg.getIpCfg();
|
||||
map.put(tableName, resultIpCfg);
|
||||
Map<String,BaseIpCfg> map=searchCfg.getIpCfg();
|
||||
map.put(tableName, searchIpCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultIpCfg!=null){
|
||||
if(resultCfg.getIpCfg()==null){
|
||||
Map<String,BaseIpCfg> map=new HashMap<String,BaseIpCfg>();
|
||||
map.put(tableName, resultIpCfg);
|
||||
resultCfg.setIpCfg(map);
|
||||
}else{
|
||||
Map<String,BaseIpCfg> map=resultCfg.getIpCfg();
|
||||
map.put(tableName, resultIpCfg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}else if(Constants.TABLE_TYPE_STRING==type){
|
||||
BaseStringCfg searchStringCfg=new BaseStringCfg();
|
||||
searchStringCfg.setTableName(tableName);
|
||||
searchStringCfg.setCompileId(compileId);
|
||||
//根据表名，编译ID查询唯一结果
|
||||
BaseStringCfg resultStringCfg=stringCfgService.get(searchStringCfg);
|
||||
searchStringCfg.setAuditorId(searchStringCfg.getCurrentUser().getId());
|
||||
searchStringCfg.setAuditTime(date);
|
||||
searchStringCfg.setCfgId(resultStringCfg.getCfgId());
|
||||
searchStringCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchStringCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultStringCfg!=null){
|
||||
resultStringCfg.setIsValid(Constants.VALID_NO);
|
||||
resultStringCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchStringCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultStringCfg!=null){
|
||||
resultStringCfg.setIsValid(Constants.VALID_YES);
|
||||
resultStringCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getStringCfg()==null){
|
||||
Map<String,BaseStringCfg> map=new HashMap<String,BaseStringCfg>();
|
||||
map.put(tableName, searchStringCfg);
|
||||
searchCfg.setStringCfg(map);
|
||||
}else{
|
||||
Map<String,BaseStringCfg> map=searchCfg.getStringCfg();
|
||||
map.put(tableName, searchStringCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultStringCfg!=null){
|
||||
if(resultCfg.getStringCfg()==null){
|
||||
searchStringCfg.setAuditorId(searchStringCfg.getCurrentUser().getId());
|
||||
searchStringCfg.setAuditTime(date);
|
||||
searchStringCfg.setCfgId(resultStringCfg.getCfgId());
|
||||
searchStringCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchStringCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultStringCfg!=null){
|
||||
resultStringCfg.setIsValid(Constants.VALID_NO);
|
||||
resultStringCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchStringCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultStringCfg!=null){
|
||||
resultStringCfg.setIsValid(Constants.VALID_YES);
|
||||
resultStringCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getStringCfg()==null){
|
||||
Map<String,BaseStringCfg> map=new HashMap<String,BaseStringCfg>();
|
||||
map.put(tableName, resultStringCfg);
|
||||
resultCfg.setStringCfg(map);
|
||||
map.put(tableName, searchStringCfg);
|
||||
searchCfg.setStringCfg(map);
|
||||
}else{
|
||||
Map<String,BaseStringCfg> map=resultCfg.getStringCfg();
|
||||
map.put(tableName, resultStringCfg);
|
||||
Map<String,BaseStringCfg> map=searchCfg.getStringCfg();
|
||||
map.put(tableName, searchStringCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultStringCfg!=null){
|
||||
if(resultCfg.getStringCfg()==null){
|
||||
Map<String,BaseStringCfg> map=new HashMap<String,BaseStringCfg>();
|
||||
map.put(tableName, resultStringCfg);
|
||||
resultCfg.setStringCfg(map);
|
||||
}else{
|
||||
Map<String,BaseStringCfg> map=resultCfg.getStringCfg();
|
||||
map.put(tableName, resultStringCfg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}else if(Constants.TABLE_TYPE_NUMBER==type){
|
||||
@@ -945,41 +948,43 @@ public class MultipleCfgController extends BaseController{
|
||||
searchNumCfg.setTableName(tableName);
|
||||
searchNumCfg.setCompileId(compileId);
|
||||
NumBoundaryCfg resultNumCfg=numCfgService.get(searchNumCfg);
|
||||
searchNumCfg.setAuditorId(searchNumCfg.getCurrentUser().getId());
|
||||
searchNumCfg.setAuditTime(date);
|
||||
searchNumCfg.setCfgId(resultNumCfg.getCfgId());
|
||||
searchNumCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchNumCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultNumCfg!=null){
|
||||
resultNumCfg.setIsValid(Constants.VALID_NO);
|
||||
resultNumCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchNumCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultNumCfg!=null){
|
||||
resultNumCfg.setIsValid(Constants.VALID_YES);
|
||||
resultNumCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getNumCfg()==null){
|
||||
Map<String,NumBoundaryCfg> map=new HashMap<String,NumBoundaryCfg>();
|
||||
map.put(tableName, searchNumCfg);
|
||||
searchCfg.setNumCfg(map);
|
||||
}else{
|
||||
Map<String,NumBoundaryCfg> map=searchCfg.getNumCfg();
|
||||
map.put(tableName, searchNumCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultNumCfg!=null){
|
||||
if(resultCfg.getNumCfg()==null){
|
||||
searchNumCfg.setAuditorId(searchNumCfg.getCurrentUser().getId());
|
||||
searchNumCfg.setAuditTime(date);
|
||||
searchNumCfg.setCfgId(resultNumCfg.getCfgId());
|
||||
searchNumCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchNumCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultNumCfg!=null){
|
||||
resultNumCfg.setIsValid(Constants.VALID_NO);
|
||||
resultNumCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchNumCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultNumCfg!=null){
|
||||
resultNumCfg.setIsValid(Constants.VALID_YES);
|
||||
resultNumCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getNumCfg()==null){
|
||||
Map<String,NumBoundaryCfg> map=new HashMap<String,NumBoundaryCfg>();
|
||||
map.put(tableName, resultNumCfg);
|
||||
resultCfg.setNumCfg(map);
|
||||
map.put(tableName, searchNumCfg);
|
||||
searchCfg.setNumCfg(map);
|
||||
}else{
|
||||
Map<String,NumBoundaryCfg> map=resultCfg.getNumCfg();
|
||||
map.put(tableName, resultNumCfg);
|
||||
Map<String,NumBoundaryCfg> map=searchCfg.getNumCfg();
|
||||
map.put(tableName, searchNumCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultNumCfg!=null){
|
||||
if(resultCfg.getNumCfg()==null){
|
||||
Map<String,NumBoundaryCfg> map=new HashMap<String,NumBoundaryCfg>();
|
||||
map.put(tableName, resultNumCfg);
|
||||
resultCfg.setNumCfg(map);
|
||||
}else{
|
||||
Map<String,NumBoundaryCfg> map=resultCfg.getNumCfg();
|
||||
map.put(tableName, resultNumCfg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}else if(Constants.TABLE_TYPE_COMPLEX==type){
|
||||
@@ -987,41 +992,43 @@ public class MultipleCfgController extends BaseController{
|
||||
searchComplexCfg.setTableName(tableName);
|
||||
searchComplexCfg.setCompileId(compileId);
|
||||
ComplexkeywordCfg resultComplexCfg=complexStringCfgService.get(searchComplexCfg);
|
||||
searchComplexCfg.setAuditorId(searchComplexCfg.getCurrentUser().getId());
|
||||
searchComplexCfg.setAuditTime(date);
|
||||
searchComplexCfg.setCfgId(resultComplexCfg.getCfgId());
|
||||
searchComplexCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchComplexCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultComplexCfg!=null){
|
||||
resultComplexCfg.setIsValid(Constants.VALID_NO);
|
||||
resultComplexCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchComplexCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultComplexCfg!=null){
|
||||
resultComplexCfg.setIsValid(Constants.VALID_YES);
|
||||
resultComplexCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getComplexCfg()==null){
|
||||
Map<String,ComplexkeywordCfg> map=new HashMap<String,ComplexkeywordCfg>();
|
||||
map.put(tableName, searchComplexCfg);
|
||||
searchCfg.setComplexCfg(map);
|
||||
}else{
|
||||
Map<String,ComplexkeywordCfg> map=searchCfg.getComplexCfg();
|
||||
map.put(tableName, searchComplexCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultComplexCfg!=null){
|
||||
if(resultCfg.getComplexCfg()==null){
|
||||
searchComplexCfg.setAuditorId(searchComplexCfg.getCurrentUser().getId());
|
||||
searchComplexCfg.setAuditTime(date);
|
||||
searchComplexCfg.setCfgId(resultComplexCfg.getCfgId());
|
||||
searchComplexCfg.setIsAudit(audit);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
|
||||
searchComplexCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultComplexCfg!=null){
|
||||
resultComplexCfg.setIsValid(Constants.VALID_NO);
|
||||
resultComplexCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
|
||||
searchComplexCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultComplexCfg!=null){
|
||||
resultComplexCfg.setIsValid(Constants.VALID_YES);
|
||||
resultComplexCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getComplexCfg()==null){
|
||||
Map<String,ComplexkeywordCfg> map=new HashMap<String,ComplexkeywordCfg>();
|
||||
map.put(tableName, resultComplexCfg);
|
||||
resultCfg.setComplexCfg(map);
|
||||
map.put(tableName, searchComplexCfg);
|
||||
searchCfg.setComplexCfg(map);
|
||||
}else{
|
||||
Map<String,ComplexkeywordCfg> map=resultCfg.getComplexCfg();
|
||||
map.put(tableName, resultComplexCfg);
|
||||
Map<String,ComplexkeywordCfg> map=searchCfg.getComplexCfg();
|
||||
map.put(tableName, searchComplexCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultComplexCfg!=null){
|
||||
if(resultCfg.getComplexCfg()==null){
|
||||
Map<String,ComplexkeywordCfg> map=new HashMap<String,ComplexkeywordCfg>();
|
||||
map.put(tableName, resultComplexCfg);
|
||||
resultCfg.setComplexCfg(map);
|
||||
}else{
|
||||
Map<String,ComplexkeywordCfg> map=resultCfg.getComplexCfg();
|
||||
map.put(tableName, resultComplexCfg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user