From 6175556f8b73e1e92f53378423359710bca60f4a Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:09:40 +0800
Subject: [PATCH] 优化报修模块，以及回访、有偿和无偿收费
---
service-job/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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
index 77ddaa5..590419b 100644
--- 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,8 +4,7 @@
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.*;
@@ -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