From d2d52b0b136ac788c410265e4071c4707f9261de Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 25 Jul 2019 20:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BB=84=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=E5=8F=96=E6=B6=88=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/BaseService.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 879311c96..e985c5b9c 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -3318,6 +3318,7 @@ public abstract class BaseService { ScriberIdCommGroupDao scriberIdCommGroupDao=SpringContextHolder.getBean(ScriberIdCommGroupDao.class); DomainCommGroupDao domainCommGroupDao=SpringContextHolder.getBean(DomainCommGroupDao.class); CommonPolicyDao commonPolicyDao=SpringContextHolder.getBean(CommonPolicyDao.class); + SchedulerDao schedulerDao=SpringContextHolder.getBean(SchedulerDao.class); AreaIpCfgDao areaIpCfgDao=SpringContextHolder.getBean(AreaIpCfgDao.class); Set ipDeletedGroups=new HashSet<>(); Set urlDeletedGroups=new HashSet<>(); @@ -3594,10 +3595,10 @@ public abstract class BaseService { } } //查询定时任务，失效定时任务 -// if(ids.toString().length()>0){ -// ids.deleteCharAt(ids.toString().length()-1); -// commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename()); -// } + if(ids.toString().length()>0){ + ids.deleteCharAt(ids.toString().length()-1); + schedulerDao.inValidByCompileIds(ids.toString()); + } } if(toUpdateCfgIndexInfos.size()>0){ StringBuffer ids=new StringBuffer(); @@ -3608,10 +3609,10 @@ public abstract class BaseService { } } //查询定时任务，失效定时任务 - if(ids.toString().length()>0){ - ids.deleteCharAt(ids.toString().length()-1); - commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename()); - } +// if(ids.toString().length()>0){ +// ids.deleteCharAt(ids.toString().length()-1); +// commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename()); +// } } //向maat发送配置 if(CollectionUtils.isNotEmpty(cancelMaatBean.getConfigCompileList())){