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

多域配置审核调整，多个maat_table进行分割

Browse Source
This commit is contained in:
wangxin
2018-03-30 14:21:14 +08:00
parent 581e110a4b
commit 894661a8b8
8 changed files with 366 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
View File

@@ -850,6 +850,8 @@ public class MultipleCfgController extends BaseController{
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){
@@ -892,6 +894,8 @@ public class MultipleCfgController extends BaseController{
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){
@@ -932,6 +936,8 @@ public class MultipleCfgController extends BaseController{
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){
@@ -972,6 +978,8 @@ public class MultipleCfgController extends BaseController{
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){
@@ -1007,8 +1015,8 @@ public class MultipleCfgController extends BaseController{
}
}
}
int result=multipleCfgService.auditCfg(resultCfg,searchCfg);
if(result==0){
boolean result=multipleCfgService.auditCfg(resultCfg,searchCfg);
if(!result){
addMessage(model,"审核失败");
}else{
addMessage(model,"审核成功,正在为您跳转页面...");