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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
chenjinsong
2018-04-09 16:24:28 +08:00
parent fdf20225aa 33382d4712
commit de3d730cd4
10 changed files with 35 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ public class MultipleCfgService extends CrudService<MultipleCfgDao,MultipleSearc
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateCfg(MultipleCfg cfg){
public int updateCfg(MultipleCfg cfg,List<BaseCfg> deleteCfg){
if(cfg==null) return 0;
if(cfg.getIpCfg()!=null){
for(BaseIpCfg _cfg:cfg.getIpCfg().values()){
@@ -104,6 +104,19 @@ public class MultipleCfgService extends CrudService<MultipleCfgDao,MultipleSearc
complexStringCfgDao.updateByPrimaryKeySelective(_cfg);
}
}
if(deleteCfg!=null&&deleteCfg.size()>0){
for(BaseCfg _cfg:deleteCfg){
if(_cfg instanceof BaseIpCfg){
ipCfgDao.deleteByCompileId((BaseIpCfg)_cfg);
}else if(_cfg instanceof BaseStringCfg){
stringCfgDao.deleteByCompileId((BaseStringCfg)_cfg);
}else if(_cfg instanceof NumBoundaryCfg){
numCfgDao.deleteByCompileId((NumBoundaryCfg)_cfg);
}else if(_cfg instanceof ComplexkeywordCfg){
complexStringCfgDao.deleteByCompileId((ComplexkeywordCfg)_cfg);
}
}
}
return 1;
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)