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

修正组清空时取消定时任务

Browse Source
This commit is contained in:
wangxin
2019-07-25 20:07:59 +08:00
parent 121fab31ea
commit d2d52b0b13
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -3318,6 +3318,7 @@ public abstract class BaseService {
ScriberIdCommGroupDao scriberIdCommGroupDao=SpringContextHolder.getBean(ScriberIdCommGroupDao.class); ScriberIdCommGroupDao scriberIdCommGroupDao=SpringContextHolder.getBean(ScriberIdCommGroupDao.class);
DomainCommGroupDao domainCommGroupDao=SpringContextHolder.getBean(DomainCommGroupDao.class); DomainCommGroupDao domainCommGroupDao=SpringContextHolder.getBean(DomainCommGroupDao.class);
CommonPolicyDao commonPolicyDao=SpringContextHolder.getBean(CommonPolicyDao.class); CommonPolicyDao commonPolicyDao=SpringContextHolder.getBean(CommonPolicyDao.class);
SchedulerDao schedulerDao=SpringContextHolder.getBean(SchedulerDao.class);
AreaIpCfgDao areaIpCfgDao=SpringContextHolder.getBean(AreaIpCfgDao.class); AreaIpCfgDao areaIpCfgDao=SpringContextHolder.getBean(AreaIpCfgDao.class);
Set<String> ipDeletedGroups=new HashSet<>(); Set<String> ipDeletedGroups=new HashSet<>();
Set<String> urlDeletedGroups=new HashSet<>(); Set<String> urlDeletedGroups=new HashSet<>();
@@ -3594,10 +3595,10 @@ public abstract class BaseService {
} }
} }
//查询定时任务，失效定时任务 //查询定时任务，失效定时任务
// if(ids.toString().length()>0){ if(ids.toString().length()>0){
// ids.deleteCharAt(ids.toString().length()-1); ids.deleteCharAt(ids.toString().length()-1);
// commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename()); schedulerDao.inValidByCompileIds(ids.toString());
// } }
} }
if(toUpdateCfgIndexInfos.size()>0){ if(toUpdateCfgIndexInfos.size()>0){
StringBuffer ids=new StringBuffer(); StringBuffer ids=new StringBuffer();
@@ -3608,10 +3609,10 @@ public abstract class BaseService {
} }
} }
//查询定时任务，失效定时任务 //查询定时任务，失效定时任务
if(ids.toString().length()>0){ // if(ids.toString().length()>0){
ids.deleteCharAt(ids.toString().length()-1); // ids.deleteCharAt(ids.toString().length()-1);
commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename()); // commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename());
} // }
} }
//向maat发送配置 //向maat发送配置
if(CollectionUtils.isNotEmpty(cancelMaatBean.getConfigCompileList())){ if(CollectionUtils.isNotEmpty(cancelMaatBean.getConfigCompileList())){