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

1 files 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<String> ipDeletedGroups=new HashSet<>();
 		Set<String> 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())){