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

39
src/main/java/com/nis/web/service/configuration/MultipleCfgService.java
View File

@@ -143,8 +143,22 @@ public class MultipleCfgService extends CrudService<MultipleCfgDao,MultipleSearc
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditCfg(MultipleCfg sendCfg,MultipleCfg cfg) throws Exception{
if(cfg==null) return 0;
public boolean auditCfg(MultipleCfg sendCfg,MultipleCfg cfg) throws Exception{
int should=0;
if(cfg.getComplexCfg()!=null){
should+=cfg.getComplexCfg().size();
}
if(cfg.getStringCfg()!=null){
should+=cfg.getStringCfg().size();
}
if(cfg.getNumCfg()!=null){
should+=cfg.getNumCfg().size();
}
if(cfg.getIpCfg()!=null){
should+=cfg.getIpCfg().size();
}
int result=0;
if(cfg==null) return false;
if(Constants.AUDIT_YES==cfg.getIsAudit()||Constants.AUDIT_NOT_YES==cfg.getIsAudit()){
List<BaseCfg> cfgs=new ArrayList<BaseCfg>();
if(sendCfg.getIpCfg()!=null){
@@ -172,52 +186,51 @@ public class MultipleCfgService extends CrudService<MultipleCfgDao,MultipleSearc
if(this.sendToMaatConvertor(cfg.getIsAudit(), null, cfgArray)){
if(cfg.getIpCfg()!=null){
for(BaseIpCfg _cfg:cfg.getIpCfg().values()){
ipCfgDao.audit(_cfg);
result+=ipCfgDao.audit(_cfg);
}
}
if(cfg.getStringCfg()!=null){
for(BaseStringCfg _cfg:cfg.getStringCfg().values()){
stringCfgDao.audit(_cfg);
result+=stringCfgDao.audit(_cfg);
}
}
if(cfg.getNumCfg()!=null){
for(NumBoundaryCfg _cfg:cfg.getNumCfg().values()){
numCfgDao.audit(_cfg);
result+=numCfgDao.audit(_cfg);
}
}
if(cfg.getComplexCfg()!=null){
for(ComplexkeywordCfg _cfg:cfg.getComplexCfg().values()){
complexStringCfgDao.audit(_cfg);
result+=complexStringCfgDao.audit(_cfg);
}
}
}else{
return 0;
result=0;
}
}else{
if(cfg.getIpCfg()!=null){
for(BaseIpCfg _cfg:cfg.getIpCfg().values()){
ipCfgDao.audit(_cfg);
result+=ipCfgDao.audit(_cfg);
}
}
if(cfg.getStringCfg()!=null){
for(BaseStringCfg _cfg:cfg.getStringCfg().values()){
stringCfgDao.audit(_cfg);
result+=stringCfgDao.audit(_cfg);
}
}
if(cfg.getNumCfg()!=null){
for(NumBoundaryCfg _cfg:cfg.getNumCfg().values()){
numCfgDao.audit(_cfg);
result+=numCfgDao.audit(_cfg);
}
}
if(cfg.getComplexCfg()!=null){
for(ComplexkeywordCfg _cfg:cfg.getComplexCfg().values()){
complexStringCfgDao.audit(_cfg);
result+=complexStringCfgDao.audit(_cfg);
}
}
}
return 1;
return should==result;
}
/**