From 19590c54225d25fd03b8b5f8adb06e62f6c543c3 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Wed, 3 Jul 2024 23:25:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta2):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E4=B8=BAnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/support/dispatch/ReduceActor.java | 2 +- .../job/task/support/handler/WorkflowBatchHandler.java | 8 ++++---- .../support/request/MapTaskPostHttpRequestHandler.java | 2 +- .../server/web/service/impl/WorkflowBatchServiceImpl.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java index 4a5d569f..aa0d9fad 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java @@ -111,7 +111,7 @@ public class ReduceActor extends AbstractActor { if (Objects.nonNull(reduceTask.getWorkflowTaskBatchId())) { WorkflowTaskBatch workflowTaskBatch = workflowTaskBatchMapper.selectOne( new LambdaQueryWrapper() - .select(WorkflowTaskBatch::getWfContext) + .select(WorkflowTaskBatch::getWfContext, WorkflowTaskBatch::getId) .eq(WorkflowTaskBatch::getId, reduceTask.getWorkflowTaskBatchId()) ); wfContext = workflowTaskBatch.getWfContext(); diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java index b6b635c3..f7c6155f 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java @@ -226,7 +226,7 @@ public class WorkflowBatchHandler { * 重新触发未执行成功的工作流节点 * * @param workflowTaskBatchId 工作流批次 - * @param workflowTaskBatch 工作流批次信息(若为null, 则会通过workflowTaskBatchId查询) + * @param workflowTaskBatch 工作流批次信息(若为null, 则会通过workflowTaskBatchId查询) * @throws IOException */ public void recoveryWorkflowExecutor(Long workflowTaskBatchId, WorkflowTaskBatch workflowTaskBatch) throws IOException { @@ -342,7 +342,7 @@ public class WorkflowBatchHandler { Retryer retryer = RetryerBuilder.newBuilder() .retryIfResult(result -> result.equals(Boolean.FALSE)) .retryIfException(ex -> true) - .withWaitStrategy(WaitStrategies.randomWait(1000, TimeUnit.MILLISECONDS)) + .withWaitStrategy(WaitStrategies.randomWait(800, TimeUnit.MILLISECONDS, 2000, TimeUnit.MILLISECONDS)) // 重试3秒 .withStopStrategy(StopStrategies.stopAfterAttempt(3)) .withRetryListener(new RetryListener() { @@ -356,8 +356,8 @@ public class WorkflowBatchHandler { } } - SnailJobLog.LOCAL.info("第【{}】次尝试更新上下文. result:[{}] treadName:[{}]", - attempt.getAttemptNumber(), result, Thread.currentThread().getName()); + SnailJobLog.LOCAL.info("第【{}】次尝试更新上下文.taskBatchIds:[{}] result:[{}] treadName:[{}] ", + attempt.getAttemptNumber(), taskBatchIds, result, Thread.currentThread().getName()); } }).build(); diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/MapTaskPostHttpRequestHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/MapTaskPostHttpRequestHandler.java index 53028cc8..bb516218 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/MapTaskPostHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/MapTaskPostHttpRequestHandler.java @@ -100,7 +100,7 @@ public class MapTaskPostHttpRequestHandler extends PostHttpRequestHandler { if (Objects.nonNull(mapTaskRequest.getWorkflowTaskBatchId())) { WorkflowTaskBatch workflowTaskBatch = workflowTaskBatchMapper.selectOne( new LambdaQueryWrapper() - .select(WorkflowTaskBatch::getWfContext) + .select(WorkflowTaskBatch::getWfContext, WorkflowTaskBatch::getId) .eq(WorkflowTaskBatch::getId, mapTaskRequest.getWorkflowTaskBatchId()) ); newWfContext = workflowTaskBatch.getWfContext(); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java index 762014c7..811a1f01 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java @@ -197,9 +197,9 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { jobBatchResponseVO.setJobId(jobTask.getJobId()); } // 只为前端展示提供 - nodeInfo.setTaskBatchStatus(NOT_HANDLE_STATUS); - jobBatchResponseVO.setTaskBatchStatus(NOT_HANDLE_STATUS); - jobBatchResponseVO.setOperationReason(JobOperationReasonEnum.WORKFLOW_NODE_NO_REQUIRED.getReason()); +// nodeInfo.setTaskBatchStatus(NOT_HANDLE_STATUS); +// jobBatchResponseVO.setTaskBatchStatus(NOT_HANDLE_STATUS); +// jobBatchResponseVO.setOperationReason(JobOperationReasonEnum.WORKFLOW_NODE_NO_REQUIRED.getReason()); nodeInfo.setJobBatchList(Lists.newArrayList(jobBatchResponseVO)); } }