From 8fde82c06784815c3e247ef17c71798bbd082747 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Thu, 2 Jan 2025 22:39:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:(1.3.0-beta1.1):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=9C=BA=E6=99=AF=E4=BF=9D=E5=AD=98=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/web/service/handler/WorkflowHandler.java | 2 +- .../server/web/service/impl/SceneConfigServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java index 85a157bb..c7c11a70 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java @@ -191,7 +191,7 @@ public class WorkflowHandler { WorkflowRequestVO.NodeConfig childNode = nodeInfo.getChildNode(); if (Objects.nonNull(childNode) && CollUtil.isNotEmpty(childNode.getConditionNodes())) { buildGraph(Lists.newArrayList(workflowNode.getId()), - tempDeque, + Objects.isNull(tempDeque) ? deque : tempDeque, groupName, workflowId, childNode, graph, version); } else { if (WorkflowNodeTypeEnum.DECISION.getType() == nodeConfig.getNodeType()) { diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java index 96042aab..fd0ba8ab 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java @@ -125,7 +125,9 @@ public class SceneConfigServiceImpl implements SceneConfigService { RetrySceneConfig retrySceneConfig = SceneConfigConverter.INSTANCE.toRetrySceneConfig(requestVO); retrySceneConfig.setCreateDt(LocalDateTime.now()); retrySceneConfig.setNamespaceId(namespaceId); - retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(requestVO.getNotifyIds())); + + retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(requestVO.getNotifyIds()).orElse(Sets.newHashSet()))); + if (requestVO.getBackOff() == WaitStrategies.WaitStrategyEnum.DELAY_LEVEL.getType()) { retrySceneConfig.setTriggerInterval(StrUtil.EMPTY); } @@ -153,7 +155,7 @@ public class SceneConfigServiceImpl implements SceneConfigService { retrySceneConfig.setTriggerInterval( Optional.ofNullable(retrySceneConfig.getTriggerInterval()).orElse(StrUtil.EMPTY)); - retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(requestVO.getNotifyIds())); + retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(requestVO.getNotifyIds()).orElse(Sets.newHashSet()))); Assert.isTrue(1 == accessTemplate.getSceneConfigAccess().update(retrySceneConfig, new LambdaUpdateWrapper() .eq(RetrySceneConfig::getNamespaceId, namespaceId)