From 5f7eb1ec43a7eb471d463899d3ec0c7b46abe6ae Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Wed, 19 Jun 2019 11:13:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=89=80=E6=9C=89=E5=9F=9F?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=E5=BC=95=E7=94=A8=E7=BB=84=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/configuration/CommonPolicyDao.java |  1 +
 .../web/dao/configuration/CommonPolicyDao.xml  |  5 +++++
 .../java/com/nis/web/service/BaseService.java  | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+)

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<ObjGroupCfg> getObjGroupList(@Param("ids")String ids);
 
 	List<ObjGroupCfg> 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 @@
             </otherwise>
         </choose>
     </select>
+    <delete id="cancelScheduCfg" >
+        delete from schedule_cfg
+        where table_name= #{tableName}
+        and compile_id in(${compileIds})
+    </delete>
 </mapper>
\ 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发送配置