diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java index 7a19fc2e..e64c157a 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java @@ -37,6 +37,15 @@ public interface ConfigAccess extends Access { */ RetrySceneConfig getSceneConfigByGroupNameAndSceneName(String groupName, String sceneName, String namespaceId); + /** + * 获取场景配置集合 + * + * @param groupNames 组名称 + * @param sceneNames 场景名称 + * @param namespaceIds 命名空间 + * @return {@link RetrySceneConfig} 场景配置 + */ + List getSceneConfigByGroupNameAndSceneNameList(Set groupNames, Set sceneNames, Set namespaceIds); /** * 获取通知配置 diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java index e2414ad8..573963d4 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java @@ -63,6 +63,13 @@ public abstract class AbstractConfigAccess implements ConfigAccess { .eq(RetrySceneConfig::getSceneName, sceneName)); } + protected List getByGroupNameAndSceneNameList(Set groupNames, Set sceneNames, Set namespaceIds) { + return sceneConfigMapper.selectList(new LambdaQueryWrapper() + .in(RetrySceneConfig::getNamespaceId, namespaceIds) + .in(RetrySceneConfig::getGroupName, groupNames) + .in(RetrySceneConfig::getSceneName, sceneNames)); + } + protected List getSceneConfigs(String groupName) { return sceneConfigMapper.selectList(new LambdaQueryWrapper() .eq(RetrySceneConfig::getGroupName, groupName)); @@ -94,6 +101,11 @@ public abstract class AbstractConfigAccess implements ConfigAccess { return getByGroupNameAndSceneName(groupName, sceneName, namespaceId); } + @Override + public List getSceneConfigByGroupNameAndSceneNameList(Set groupNames, Set sceneNames, Set namespaceIds) { + return getByGroupNameAndSceneNameList(groupNames, sceneNames, namespaceIds); + } + @Override public List getNotifyListConfigByGroupName(String groupName, String namespaceId) { return getNotifyConfigs(groupName, namespaceId); diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/dataobject/WorkflowBatchResponseDO.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/dataobject/WorkflowBatchResponseDO.java index efb4de07..7572eec3 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/dataobject/WorkflowBatchResponseDO.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/dataobject/WorkflowBatchResponseDO.java @@ -53,4 +53,9 @@ public class WorkflowBatchResponseDO { * 创建时间 */ private LocalDateTime createDt; + + /** + * 通知配置 + */ + private String notifyIds; } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml index dee45f47..e69780de 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml +++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml @@ -15,7 +15,8 @@