diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index 81f28c4ef..222c74b13 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -208,8 +208,8 @@ true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 219.146.91.110 + a746dde3-7a13-4521-b986-7369b0b7c269 http://localhost:9411 diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index bfff8dc70..28e071ffd 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -186,8 +186,8 @@ true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 219.146.91.110 + a746dde3-7a13-4521-b986-7369b0b7c269 diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java index 4d5e139ff..e4a90a0f9 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java @@ -32,4 +32,8 @@ public interface ScheduleJobDao extends BaseDao { * 根据params删除某一个定时任务 */ void deleteJobByParams(@Param("params")String params); + /** + * 根据params删除某一个定时任务 + */ + void deleteJobById(@Param("id")String id); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/init/JobCommandLineRunner.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/init/JobCommandLineRunner.java index 2559b999b..80dc9a29b 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/init/JobCommandLineRunner.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/init/JobCommandLineRunner.java @@ -13,12 +13,15 @@ import com.elink.esua.epdc.utils.ScheduleUtils; import com.elink.esua.epdc.dao.ScheduleJobDao; import com.elink.esua.epdc.entity.ScheduleJobEntity; import com.elink.esua.epdc.utils.ScheduleUtils; +import org.quartz.CronExpression; import org.quartz.CronTrigger; import org.quartz.Scheduler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; +import java.text.ParseException; +import java.util.Date; import java.util.List; /** @@ -34,9 +37,17 @@ public class JobCommandLineRunner implements CommandLineRunner { private ScheduleJobDao scheduleJobDao; @Override - public void run(String... args) { + public void run(String... args) throws ParseException { List scheduleJobList = scheduleJobDao.selectList(null); for(ScheduleJobEntity scheduleJob : scheduleJobList){ + Date date; + CronExpression exp = new CronExpression(scheduleJob.getCronExpression()); + date = exp.getNextValidTimeAfter(new Date()); + if (date == null) { + scheduleJobDao.deleteJobById(scheduleJob.getId().toString()); + System.out.println("delete"); + continue; + } CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, scheduleJob.getId()); //如果不存在，则创建 if(cronTrigger == null) { diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java index c1932e4db..db1b46944 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java @@ -132,20 +132,7 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("params", params); - List scheduleJobEntities = baseDao.selectList(wrapper); - - if (CollUtil.isNotEmpty(scheduleJobEntities)) { - Long[] jobIds = scheduleJobEntities.stream() - .map(ScheduleJobEntity::getId) - .distinct() - .toArray(Long[]::new); - - this.deleteBatch(jobIds); - } - + baseDao.deleteJobByParams(params); } } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml index 836c17b76..debf04527 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml @@ -14,5 +14,8 @@ delete from schedule_job where params = #{params} + + delete from schedule_job where id = #{id} + diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml index f7569f6a8..b5bf51f6d 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml @@ -186,8 +186,8 @@ true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 219.146.91.110 + a746dde3-7a13-4521-b986-7369b0b7c269