diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java index b01cc2ee5..9955ec679 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java @@ -51,4 +51,5 @@ public interface CommonPolicyDao { List getObjGroupList(@Param("ids")String ids); List getObjGroupPagedList(ObjGroupCfg entity); + void cancelScheduCfg(@Param("compileIds")String compileIds,@Param("tableName")String tableName); } diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index bf73fbeba..5882f1cdd 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -1250,4 +1250,9 @@ + + delete from schedule_cfg + where table_name= #{tableName} + and compile_id in(${compileIds}) + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 753ee5ca3..12b2506dd 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -3558,13 +3558,31 @@ public abstract class BaseService { } //需要更新的cfg_index_info数据库更新 if(toCancelCfgIndexInfos.size()>0){ + StringBuffer ids=new StringBuffer(); for(CfgIndexInfo info:toCancelCfgIndexInfos){ commonPolicyDao.updateCfgIndexCommonGroupIds(info); + if(StringUtils.isBlank(info.getCommonGroupIds())){ + ids.append(info.getCompileId()+","); + } + } + //查询定时任务,失效定时任务 + if(ids.toString().length()>0){ + ids.deleteCharAt(ids.toString().length()-1); + commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename()); } } if(toUpdateCfgIndexInfos.size()>0){ + StringBuffer ids=new StringBuffer(); for(CfgIndexInfo info:toUpdateCfgIndexInfos){ commonPolicyDao.updateCfgIndexCommonGroupIds(info); + if(StringUtils.isBlank(info.getCommonGroupIds())){ + ids.append(info.getCompileId()+","); + } + } + //查询定时任务,失效定时任务 + if(ids.toString().length()>0){ + ids.deleteCharAt(ids.toString().length()-1); + commonPolicyDao.cancelScheduCfg(ids.toString(),CfgIndexInfo.getTablename()); } } //向maat发送配置