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

(1)删除配置时级联删除配置相关的区域IP

Browse Source 
(2)修复ip配置删除完成跳转到审核菜单的bug
This commit is contained in:
wangxin
2018-04-10 10:42:24 +08:00
parent 4e11a9ce02
commit 00b1d19065
10 changed files with 83 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java
View File

@@ -95,7 +95,10 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteStringCfg(ComplexkeywordCfg cfg){
public int deleteStringCfg(ComplexkeywordCfg cfg,List<AreaIpCfg> areaCfg){
if(areaCfg!=null&&areaCfg.size()>0){
this.deleteIpBatch(areaCfg);
}
return complexStringCfgDao.updateValid(cfg);
}
/**

5
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -99,7 +99,10 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteIpCfg(BaseIpCfg baseIpCfg){
public int deleteIpCfg(BaseIpCfg baseIpCfg, List<AreaIpCfg> areaCfg){
if(areaCfg!=null&&areaCfg.size()>0){
this.deleteIpBatch(areaCfg);
}
return ipCfgDao.updateValid(baseIpCfg);
}
/**

5
src/main/java/com/nis/web/service/configuration/StringCfgService.java
View File

@@ -95,7 +95,10 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteStringCfg(BaseStringCfg baseStringCfg){
public int deleteStringCfg(BaseStringCfg baseStringCfg,List<AreaIpCfg> areaCfg){
if(areaCfg!=null&&areaCfg.size()>0){
this.deleteIpBatch(areaCfg);
}
return stringCfgDao.updateValid(baseStringCfg);
}
/**