From bae6e39721e4d957a93cce36746298affed208a8 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Fri, 10 Jan 2025 23:26:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:(1.3.0-beta1.1):=20=E4=BC=98=E5=8C=96job?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E6=B5=81notify=E5=92=8C=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=9A=84notifyIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../snailjob/server/web/service/convert/WorkflowConverter.java | 3 +++
 .../snailjob/server/web/service/impl/JobServiceImpl.java       | 2 --
 .../server/web/service/impl/SceneConfigServiceImpl.java        | 2 --
 .../snailjob/server/web/service/impl/WorkflowServiceImpl.java  | 3 ---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java
index 298f3c565..fd8011328 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java
@@ -37,6 +37,9 @@ public interface WorkflowConverter {
 
     WorkflowConverter INSTANCE = Mappers.getMapper(WorkflowConverter.class);
 
+    @Mappings({
+            @Mapping(target = "notifyIds", expression = "java(WorkflowConverter.toNotifyIdsStr(workflowRequestVO.getNotifyIds()))")
+    })
     Workflow convert(WorkflowRequestVO workflowRequestVO);
 
     WorkflowNode convert(WorkflowRequestVO.NodeInfo nodeInfo);
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
index 2ad7f334d..ae17889b0 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
@@ -151,7 +151,6 @@ public class JobServiceImpl implements JobService {
                 % systemProperties.getBucketTotal());
         job.setNextTriggerAt(calculateNextTriggerAt(jobRequestVO, DateUtils.toNowMilli()));
         job.setNamespaceId(UserSessionUtils.currentUserSession().getNamespaceId());
-        job.setNotifyIds(JsonUtil.toJsonString(jobRequestVO.getNotifyIds()));
         job.setOwnerId(jobRequestVO.getOwnerId());
         job.setId(null);
         return 1 == jobMapper.insert(job);
@@ -166,7 +165,6 @@ public class JobServiceImpl implements JobService {
 
         // 判断常驻任务
         Job updateJob = JobConverter.INSTANCE.convert(jobRequestVO);
-        updateJob.setNotifyIds(JsonUtil.toJsonString(jobRequestVO.getNotifyIds()));
         updateJob.setOwnerId(jobRequestVO.getOwnerId());
         updateJob.setResident(isResident(jobRequestVO));
         updateJob.setNamespaceId(job.getNamespaceId());
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 fd0ba8ab0..4f1907da2 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
@@ -126,8 +126,6 @@ public class SceneConfigServiceImpl implements SceneConfigService {
         retrySceneConfig.setCreateDt(LocalDateTime.now());
         retrySceneConfig.setNamespaceId(namespaceId);
 
-        retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(requestVO.getNotifyIds()).orElse(Sets.newHashSet())));
-
         if (requestVO.getBackOff() == WaitStrategies.WaitStrategyEnum.DELAY_LEVEL.getType()) {
             retrySceneConfig.setTriggerInterval(StrUtil.EMPTY);
         }
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 bc5dfa502..f18d59421 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
@@ -128,8 +128,6 @@ public class WorkflowServiceImpl implements WorkflowService {
                 HashUtil.bkdrHash(workflowRequestVO.getGroupName() + workflowRequestVO.getWorkflowName())
                         % systemProperties.getBucketTotal());
         workflow.setNamespaceId(UserSessionUtils.currentUserSession().getNamespaceId());
-        workflow.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(workflowRequestVO.getNotifyIds()).orElse(Sets.newHashSet())));
-
         workflow.setId(null);
         Assert.isTrue(1 == workflowMapper.insert(workflow), () -> new SnailJobServerException("新增工作流失败"));
 
@@ -227,7 +225,6 @@ 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(Optional.ofNullable(workflowRequestVO.getNotifyIds()).orElse(Sets.newHashSet())));
         // 不允许更新组
         workflow.setGroupName(null);
         Assert.isTrue(