From 37c4adb37066be56c628d24bf4f6dfe8f55979f6 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Fri, 27 Dec 2024 23:19:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:(1.3.0-beta1):=201.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E9=80=9A=E7=9F=A5=E9=85=8D=E7=BD=AE?= =?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 --- .../snailjob/server/common/register/ClientRegister.java | 2 +- .../server/web/service/impl/WorkflowServiceImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ClientRegister.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ClientRegister.java index 9520bfbcb..ee4b25897 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ClientRegister.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ClientRegister.java @@ -157,7 +157,7 @@ public class ClientRegister extends AbstractRegister { } if (CollUtil.isEmpty(waitRefreshDBClientNodes)) { - SnailJobLog.LOCAL.warn("clientNodes is empty"); + SnailJobLog.LOCAL.debug("clientNodes is empty"); return; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java index 1d1e0d721..da713a741 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java @@ -48,6 +48,7 @@ import com.aizuda.snailjob.template.datasource.persistence.po.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import com.google.common.graph.ElementOrder; import com.google.common.graph.GraphBuilder; import com.google.common.graph.MutableGraph; @@ -127,7 +128,7 @@ public class WorkflowServiceImpl implements WorkflowService { HashUtil.bkdrHash(workflowRequestVO.getGroupName() + workflowRequestVO.getWorkflowName()) % systemProperties.getBucketTotal()); workflow.setNamespaceId(UserSessionUtils.currentUserSession().getNamespaceId()); - workflow.setNotifyIds(JsonUtil.toJsonString(workflowRequestVO.getNotifyIds())); + workflow.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(workflowRequestVO.getNotifyIds()).orElse(Sets.newHashSet()))); workflow.setId(null); Assert.isTrue(1 == workflowMapper.insert(workflow), () -> new SnailJobServerException("新增工作流失败")); @@ -226,7 +227,7 @@ public class WorkflowServiceImpl implements WorkflowService { workflow.setVersion(version); workflow.setNextTriggerAt(calculateNextTriggerAt(workflowRequestVO, DateUtils.toNowMilli())); workflow.setFlowInfo(JsonUtil.toJsonString(GraphUtils.serializeGraphToJson(graph))); - workflow.setNotifyIds(JsonUtil.toJsonString(workflowRequestVO.getNotifyIds())); + workflow.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(workflowRequestVO.getNotifyIds()).orElse(Sets.newHashSet()))); // 不允许更新组 workflow.setGroupName(null); Assert.isTrue(