From 0cc7a9650b7e23127254fdb90e3d264b0d483323 Mon Sep 17 00:00:00 2001 From: wodeyangzipingpingwuqi Date: Thu, 26 Dec 2024 17:49:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:(1.3.0-beta1):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/datasource/persistence/po/NotifyConfig.java | 1 + .../server/web/model/request/NotifyConfigQueryVO.java | 3 +++ .../server/web/service/impl/NotifyConfigServiceImpl.java | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java index 62ecb08b..f4fc3ec3 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java @@ -17,6 +17,7 @@ public class NotifyConfig extends CreateUpdateDt { private String namespaceId; private String groupName; + // // /** // * 业务id (scene_name或job_id或workflow_id) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigQueryVO.java index 1769c397..0f9de7e7 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigQueryVO.java @@ -14,4 +14,7 @@ import lombok.EqualsAndHashCode; public class NotifyConfigQueryVO extends BaseQueryVO { private String groupName; private String sceneName; + private Integer systemTaskType; + private Integer notifyStatus; + private String notifyName; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java index 21794f93..c950d385 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -50,6 +51,9 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { .eq(NotifyConfig::getNamespaceId, userSessionVO.getNamespaceId()) .in(CollUtil.isNotEmpty(groupNames), NotifyConfig::getGroupName, groupNames) .eq(StrUtil.isNotBlank(queryVO.getGroupName()), NotifyConfig::getGroupName, queryVO.getGroupName()) + .eq(Objects.nonNull(queryVO.getNotifyStatus()), NotifyConfig::getNotifyStatus, queryVO.getNotifyStatus()) + .eq(Objects.nonNull(queryVO.getSystemTaskType()), NotifyConfig::getSystemTaskType, queryVO.getSystemTaskType()) + .like(StrUtil.isNotBlank(queryVO.getNotifyName()), NotifyConfig::getNotifyName, queryVO.getNotifyName()) .orderByDesc(NotifyConfig::getId)) .getRecords();