白名单增加定时任务处理；

修复白名单热修改被覆盖jsp

src/main/java/com/nis/web/dao/SchedulerDao.java

@@ -22,12 +22,18 @@ public interface SchedulerDao extends CrudDao<ScheduleCfg> {
 	 */
 	List<ScheduleCfg>  findNewlyCfg(@Param("id")Long id,@Param("limit")Long limit,@Param("type")int type,@Param("delFlag")Integer delFlag);
 	
+	/**
+	 * 删除定时任务
+	 * @param cfg
+	 * @return
+	 */
+	int deleteByCompileIds(@Param("compileIds")String compileIds,@Param("type")Integer type);
 	/**
 	 * 更新 del_flag 字段为删除标识
 	 * @param cfg
 	 * @return
 	 */
-	int deleteByCompileIds(String compileIds);
+	int inValidByCompileIds(@Param("compileIds")String compileIds);
 
 	/**
 	 * 查找 配置 下发 最新记录

src/main/java/com/nis/web/dao/SchedulerDao.xml

@@ -94,7 +94,6 @@
 			<include refid="scheduleCfgColumns"/>	
 		from schedule_cfg a
 		<where>
-			del_Flag = #{DEL_FLAG_NORMAL}
 			<if test="id != null">
 				and id = #{id}
 			</if>
@@ -116,12 +115,15 @@
 			<if test="tableName != null and tableName != ''">
 				and table_name = #{tableName}
 			</if>
+			and type = 1
+			<!-- del_Flag = #{DEL_FLAG_NORMAL} -->
+			and name is null
 			<!-- 动态where条件 -->
 			<if test=" whereStr != null and whereStr !=''">
 				${whereStr}
 			</if>
 		</where>
-		order by a.id
+		order by a.id desc
 	</select>
 	
 	<!-- 查找最新的更新数据 -->
@@ -242,12 +244,17 @@
 	</insert>
 	
 	<!-- 根据 compileIds 将定时任务失效，定时任务的修改策略为：删除之前的所有配置，新增 -->
-	<update id="deleteByCompileIds" parameterType="com.nis.domain.ScheduleCfg">
+	<update id="inValidByCompileIds" parameterType="com.nis.domain.ScheduleCfg">
 		update schedule_cfg 
 		<set>
 			del_flag = 0
 		</set>  
-		WHERE compile_Id in (#{compileIds}) and  del_flag =1
+		WHERE compile_Id in (${compileIds}) and  del_flag =1
+	</update>
+	<!-- 根据 compileIds 将定时任务删除 -->
+	<update id="deleteByCompileIds">
+		delete from schedule_cfg 
+			WHERE compile_Id in (${compileIds}) and type=#{type}
 	</update>