gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat:2.4.0

Browse Source 
1. 修复Job列表查询错误问题
This commit is contained in:
byteblogs168 2023-10-26 23:56:20 +08:00
parent 8e4c6e07ec
commit ac671d2ae7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/idempotent/TimerIdempotent.java
View File

@ -1,9 +1,11 @@
package com.aizuda.easy.retry.server.job.task.support.idempotent; package com.aizuda.easy.retry.server.job.task.support.idempotent;
import com.aizuda.easy.retry.server.common.IdempotentStrategy; import com.aizuda.easy.retry.server.common.IdempotentStrategy;
import scala.collection.immutable.Stream;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
/** /**
* @author www.byteblogs.com * @author www.byteblogs.com
@ -12,7 +14,7 @@ import java.util.Set;
*/ */
public class TimerIdempotent implements IdempotentStrategy<Long, Long> { public class TimerIdempotent implements IdempotentStrategy<Long, Long> {
private static final Set<Long> cache = new HashSet<>(); private static final CopyOnWriteArraySet<Long> cache = new CopyOnWriteArraySet<>();
@Override @Override
public boolean set(Long key, Long value) { public boolean set(Long key, Long value) {

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java
View File

@ -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.common.core.enums.StatusEnum;
import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; 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.JobTimerTaskDTO;
import com.aizuda.easy.retry.server.job.task.dto.TaskExecuteDTO; 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.WaitStrategy;
import com.aizuda.easy.retry.server.job.task.support.cache.ResidentTaskCache; import com.aizuda.easy.retry.server.job.task.support.cache.ResidentTaskCache;
import com.aizuda.easy.retry.server.job.task.support.strategy.WaitStrategies; 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); Duration duration = Duration.between(preTriggerAt, nextTriggerAt);
long milliseconds = duration.toMillis(); long milliseconds = duration.toMillis();
log.info("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, System.currentTimeMillis() % 1000); log.info("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, System.currentTimeMillis() % 100);
job.setNextTriggerAt(nextTriggerAt); 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); ResidentTaskCache.refresh(jobTimerTaskDTO.getJobId(), nextTriggerAt);
} }
} }

4
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java
View File

@ -66,7 +66,7 @@ public class JobServiceImpl implements JobService {
queryWrapper.eq(Job::getJobStatus, queryVO.getJobStatus()); queryWrapper.eq(Job::getJobStatus, queryVO.getJobStatus());
} }
queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus()); queryWrapper.eq(Job::getDeleted, StatusEnum.NO.getStatus());
queryWrapper.orderByDesc(Job::getId); queryWrapper.orderByDesc(Job::getId);
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper); PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper);
@ -114,7 +114,7 @@ public class JobServiceImpl implements JobService {
queryWrapper.eq(Job::getId, jobId); queryWrapper.eq(Job::getId, jobId);
} }
queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus()); queryWrapper.eq(Job::getDeleted, StatusEnum.NO.getStatus());
PageDTO<Job> pageDTO = new PageDTO<>(1, 20); PageDTO<Job> pageDTO = new PageDTO<>(1, 20);
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper); PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper);
return JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords()); return JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords());