From ac671d2ae75e8f28e527728eb4fd240bacd3ac00 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 26 Oct 2023 23:56:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:2.4.0=201.=20=E4=BF=AE=E5=A4=8DJob?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/support/idempotent/TimerIdempotent.java | 4 +++- .../retry/server/job/task/support/timer/JobTimerTask.java | 6 ++---- .../easy/retry/server/web/service/impl/JobServiceImpl.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/idempotent/TimerIdempotent.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/idempotent/TimerIdempotent.java index 6afabc13..0aa84d8a 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/idempotent/TimerIdempotent.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/idempotent/TimerIdempotent.java @@ -1,9 +1,11 @@ package com.aizuda.easy.retry.server.job.task.support.idempotent; import com.aizuda.easy.retry.server.common.IdempotentStrategy; +import scala.collection.immutable.Stream; import java.util.HashSet; import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; /** * @author www.byteblogs.com @@ -12,7 +14,7 @@ import java.util.Set; */ public class TimerIdempotent implements IdempotentStrategy { - private static final Set cache = new HashSet<>(); + private static final CopyOnWriteArraySet cache = new CopyOnWriteArraySet<>(); @Override public boolean set(Long key, Long value) { diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java index 6dfac7da..a61ad195 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java @@ -8,10 +8,8 @@ import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.easy.retry.common.core.enums.StatusEnum; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; import com.aizuda.easy.retry.server.job.task.dto.JobTimerTaskDTO; import com.aizuda.easy.retry.server.job.task.dto.TaskExecuteDTO; -import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.support.WaitStrategy; import com.aizuda.easy.retry.server.job.task.support.cache.ResidentTaskCache; import com.aizuda.easy.retry.server.job.task.support.strategy.WaitStrategies; @@ -124,10 +122,10 @@ public class JobTimerTask implements TimerTask { Duration duration = Duration.between(preTriggerAt, nextTriggerAt); long milliseconds = duration.toMillis(); - log.info("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, System.currentTimeMillis() % 1000); + log.info("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, System.currentTimeMillis() % 100); job.setNextTriggerAt(nextTriggerAt); - JobTimerWheel.register(jobTimerTaskDTO.getTaskBatchId(), timerTask, milliseconds - System.currentTimeMillis() % 1000, TimeUnit.MILLISECONDS); + JobTimerWheel.register(jobTimerTaskDTO.getTaskBatchId(), timerTask, milliseconds - System.currentTimeMillis() % 100, TimeUnit.MILLISECONDS); ResidentTaskCache.refresh(jobTimerTaskDTO.getJobId(), nextTriggerAt); } } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java index 19006818..325066b7 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java @@ -66,7 +66,7 @@ public class JobServiceImpl implements JobService { queryWrapper.eq(Job::getJobStatus, queryVO.getJobStatus()); } - queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus()); + queryWrapper.eq(Job::getDeleted, StatusEnum.NO.getStatus()); queryWrapper.orderByDesc(Job::getId); PageDTO selectPage = jobMapper.selectPage(pageDTO, queryWrapper); @@ -114,7 +114,7 @@ public class JobServiceImpl implements JobService { queryWrapper.eq(Job::getId, jobId); } - queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus()); + queryWrapper.eq(Job::getDeleted, StatusEnum.NO.getStatus()); PageDTO pageDTO = new PageDTO<>(1, 20); PageDTO selectPage = jobMapper.selectPage(pageDTO, queryWrapper); return JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords());