From 28e7d3937f819a3486b22bfa1c84aee172aaccb4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 17:46:42 +0800
Subject: [PATCH] 优化代码

---
 service-job/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java b/service-job/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
old mode 100644
new mode 100755
index 77ddaa5..899a6aa
--- a/service-job/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
+++ b/service-job/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java
@@ -4,13 +4,12 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.job.dao.IHcFtpFileDAO;
-import com.java110.job.smo.DownloadFileFromFtpToTable;
-import com.java110.job.task.HcFtpToFileSystemJob;
+import com.java110.job.quartz.TaskSystemJob;
 import org.apache.commons.validator.GenericValidator;
 import org.apache.commons.validator.util.ValidatorUtils;
 import org.quartz.*;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -502,18 +501,18 @@
 				String triggerName = triggerNames + taskId;
 
 				//璁剧疆浠诲姟鍚嶇О
-				JobKey jobKey = new JobKey(jobName,HcFtpToFileSystemJob.JOB_GROUP_NAME);
+				JobKey jobKey = new JobKey(jobName, TaskSystemJob.JOB_GROUP_NAME);
 				JobDetail jobDetail = scheduler.getJobDetail(jobKey);
 
 				if (jobDetail == null) {
 					// 浠诲姟鍚嶇О
 					String taskCfgName = (String) doFtpItem.get("TASKNAME");
 					//鏋勫缓job淇℃伅
-					JobDetail warnJob = JobBuilder.newJob(HcFtpToFileSystemJob.class).withIdentity(jobName, HcFtpToFileSystemJob.JOB_GROUP_NAME).withDescription("浠诲姟鍚姩").build();
+					JobDetail warnJob = JobBuilder.newJob(TaskSystemJob.class).withIdentity(jobName, TaskSystemJob.JOB_GROUP_NAME).withDescription("浠诲姟鍚姩").build();
 
-					warnJob.getJobDataMap().put(HcFtpToFileSystemJob.JOB_DATA_CONFIG_NAME, taskCfgName);
+					warnJob.getJobDataMap().put(TaskSystemJob.JOB_DATA_CONFIG_NAME, taskCfgName);
 
-					warnJob.getJobDataMap().put(HcFtpToFileSystemJob.JOB_DATA_TASK_ID, taskId);
+					warnJob.getJobDataMap().put(TaskSystemJob.JOB_DATA_TASK_ID, taskId);
 
 					// 瑙﹀彂鏃堕棿鐐�
 					CronTrigger warnTrigger = TriggerBuilder.newTrigger().withIdentity(triggerName, triggerName+"_group").withSchedule(cronScheduleBuilder).build();
@@ -627,13 +626,13 @@
 
 				String triggerName = prefixJobName + taskId;
 
-				TriggerKey triggerKey = TriggerKey.triggerKey(jobName, HcFtpToFileSystemJob.JOB_GROUP_NAME);
+				TriggerKey triggerKey = TriggerKey.triggerKey(jobName, TaskSystemJob.JOB_GROUP_NAME);
 				// 鍋滄瑙﹀彂鍣�
 				scheduler.pauseTrigger(triggerKey);
 				// 绉婚櫎瑙﹀彂鍣�
 				scheduler.unscheduleJob(triggerKey);
 
-				JobKey jobKey = new JobKey(jobName, HcFtpToFileSystemJob.JOB_GROUP_NAME);
+				JobKey jobKey = new JobKey(jobName, TaskSystemJob.JOB_GROUP_NAME);
 				// 鍒犻櫎浠诲姟
 				scheduler.deleteJob(jobKey);
 				// 淇敼鏁版嵁鐘舵�侊紝灏嗕换鍔℃暟鎹姸鎬佹敼涓鸿繍琛岀姸鎬�

--
Gitblit v1.8.0