From e936ace0b31ff2dc8535c69ee0f0bfcba1b11f63 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sun, 12 Jan 2025 11:11:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:(1.3.0-beta1.1):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0=E6=9C=AA?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snailjob/template/datasource/persistence/po/Job.java | 5 ++--- .../snailjob/server/web/service/convert/JobConverter.java | 2 +- .../server/web/service/convert/SceneConfigConverter.java | 2 +- .../server/web/service/convert/WorkflowConverter.java | 2 +- .../server/web/service/impl/SceneConfigServiceImpl.java | 1 - 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java index e3011ae8..5e640c20 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java @@ -3,9 +3,7 @@ package com.aizuda.snailjob.template.datasource.persistence.po; import com.aizuda.snailjob.common.core.enums.ExecutorTypeEnum; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; /** @@ -150,6 +148,7 @@ public class Job extends CreateUpdateDt { /** * 负责人id */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) private Long ownerId; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java index c721d013..0a472072 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java @@ -46,7 +46,7 @@ public interface JobConverter { static String toNotifyIdsStr(Set notifyIds) { if (CollUtil.isEmpty(notifyIds)) { - return null; + return StrUtil.EMPTY; } return JsonUtil.toJsonString(notifyIds); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java index f47decdf..251310d7 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java @@ -45,7 +45,7 @@ public interface SceneConfigConverter { static String toNotifyIdsStr(Set notifyIds) { if (CollUtil.isEmpty(notifyIds)) { - return null; + return StrUtil.EMPTY; } return JsonUtil.toJsonString(notifyIds); 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 fd801132..082c2869 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 @@ -120,7 +120,7 @@ public interface WorkflowConverter { static String toNotifyIdsStr(Set notifyIds) { if (CollUtil.isEmpty(notifyIds)) { - return null; + return StrUtil.EMPTY; } return JsonUtil.toJsonString(notifyIds); 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 4f1907da..055e0edb 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 @@ -153,7 +153,6 @@ public class SceneConfigServiceImpl implements SceneConfigService { retrySceneConfig.setTriggerInterval( Optional.ofNullable(retrySceneConfig.getTriggerInterval()).orElse(StrUtil.EMPTY)); - retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(requestVO.getNotifyIds()).orElse(Sets.newHashSet()))); Assert.isTrue(1 == accessTemplate.getSceneConfigAccess().update(retrySceneConfig, new LambdaUpdateWrapper() .eq(RetrySceneConfig::getNamespaceId, namespaceId)