From 0630c848536aa89dcff187340ee1fdefadafe26e Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Wed, 9 Apr 2025 23:24:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.5.0-beta1):=20=E6=96=B0=E5=A2=9EsceneId?= =?UTF-8?q?=E5=92=8CgroupId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/dm/mapper/RetryDeadLetterMapper.xml | 4 +++- .../src/main/resources/dm/mapper/RetryMapper.xml | 10 +++++----- .../kingbase/mapper/RetryDeadLetterMapper.xml | 4 +++- .../src/main/resources/kingbase/mapper/RetryMapper.xml | 6 +++--- .../resources/mariadb/mapper/RetryDeadLetterMapper.xml | 4 +++- .../src/main/resources/mariadb/mapper/RetryMapper.xml | 4 +++- .../resources/mysql/mapper/RetryDeadLetterMapper.xml | 4 +++- .../src/main/resources/mysql/mapper/RetryMapper.xml | 4 +++- .../resources/oracle/mapper/RetryDeadLetterMapper.xml | 4 +++- .../src/main/resources/oracle/mapper/RetryMapper.xml | 5 +++-- .../postgresql/mapper/RetryDeadLetterMapper.xml | 4 +++- .../main/resources/postgresql/mapper/RetryMapper.xml | 6 +++--- .../sqlserver/mapper/RetryDeadLetterMapper.xml | 4 +++- .../main/resources/sqlserver/mapper/RetryMapper.xml | 4 +++- .../support/generator/retry/AbstractGenerator.java | 2 ++ .../request/ReportRetryInfoHttpRequestHandler.java | 1 + 16 files changed, 47 insertions(+), 23 deletions(-) diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml index e62db0f87..fa60f1b72 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml @@ -3,14 +3,16 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, + #{item.groupId,jdbcType=BIGINT}, #{item.sceneName,jdbcType=VARCHAR}, + #{item.sceneId,jdbcType=BIGINT}, #{item.idempotentId,jdbcType=VARCHAR}, #{item.bizNo,jdbcType=VARCHAR}, #{item.executorName,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml index d8724b04d..d58100266 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml @@ -3,16 +3,16 @@ - INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, #{item.groupName}, #{item.sceneName}, #{item.idempotentId}, - #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, - #{item.taskType}, #{item.retryStatus}, #{item.createDt}, #{item.bucketIndex}, #{item.parentId}, - #{item.deleted} + #{item.namespaceId}, #{item.groupName},#{item.groupId}, #{item.sceneName}, #{item.sceneId}, + #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, + #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt}, #{item.bucketIndex}, + #{item.parentId}, #{item.deleted} ) diff --git a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml index e62db0f87..fa60f1b72 100644 --- a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml @@ -3,14 +3,16 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, + #{item.groupId,jdbcType=BIGINT}, #{item.sceneName,jdbcType=VARCHAR}, + #{item.sceneId,jdbcType=BIGINT}, #{item.idempotentId,jdbcType=VARCHAR}, #{item.bizNo,jdbcType=VARCHAR}, #{item.executorName,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml index 04fe6e00d..287ff045e 100644 --- a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml @@ -4,14 +4,14 @@ - INSERT INTO sj_retry (namespace_id, group_name, scene_name, + INSERT INTO sj_retry (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, #{item.groupName}, - #{item.sceneName}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, + #{item.namespaceId}, #{item.groupName},#{item.groupId}, #{item.sceneName}, #{item.sceneId}, + #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt}, #{item.bucketIndex}, #{item.parentId}, #{item.deleted} diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml index dadc23ddd..6c3ec50a7 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml @@ -3,14 +3,16 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, + #{item.groupId,jdbcType=BIGINT}, #{item.sceneName,jdbcType=VARCHAR}, + #{item.sceneId,jdbcType=BIGINT}, #{item.idempotentId,jdbcType=VARCHAR}, #{item.bizNo,jdbcType=VARCHAR}, #{item.executorName,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml index 8cd3d9594..38ba4a046 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml @@ -3,7 +3,7 @@ - INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES @@ -11,7 +11,9 @@ ( #{item.namespaceId}, #{item.groupName}, + #{item.groupId}, #{item.sceneName}, + #{item.sceneId}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml index dadc23ddd..6c3ec50a7 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml @@ -3,14 +3,16 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, + #{item.groupId,jdbcType=BIGINT}, #{item.sceneName,jdbcType=VARCHAR}, + #{item.sceneId,jdbcType=BIGINT}, #{item.idempotentId,jdbcType=VARCHAR}, #{item.bizNo,jdbcType=VARCHAR}, #{item.executorName,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml index 037324015..466efe822 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml @@ -3,7 +3,7 @@ - INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES @@ -11,7 +11,9 @@ ( #{item.namespaceId}, #{item.groupName}, + #{item.groupId}, #{item.sceneName}, + #{item.sceneId}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml index ee7ca8d9c..006646af1 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml @@ -3,13 +3,15 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) SELECT #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, + #{item.groupId,jdbcType=BIGINT}, #{item.sceneName,jdbcType=VARCHAR}, + #{item.sceneId,jdbcType=BIGINT}, #{item.idempotentId,jdbcType=VARCHAR}, #{item.bizNo,jdbcType=VARCHAR}, #{item.executorName,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml index 63269397a..d84286c52 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml @@ -3,12 +3,13 @@ - INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt , bucket_index, parent_id, deleted) SELECT - #{item.namespaceId}, #{item.groupName}, #{item.sceneName}, #{item.idempotentId}, + #{item.namespaceId}, #{item.groupName}, #{item.groupId}, #{item.sceneName}, #{item.sceneId}, + #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt}, #{item.bucketIndex}, #{item.parentId}, #{item.deleted} diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml index e62db0f87..fa60f1b72 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml @@ -3,14 +3,16 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, + #{item.groupId,jdbcType=BIGINT}, #{item.sceneName,jdbcType=VARCHAR}, + #{item.sceneId,jdbcType=BIGINT}, #{item.idempotentId,jdbcType=VARCHAR}, #{item.bizNo,jdbcType=VARCHAR}, #{item.executorName,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml index 12a31d4da..614037ec4 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml @@ -4,14 +4,14 @@ - INSERT INTO sj_retry (namespace_id, group_name, scene_name, + INSERT INTO sj_retry (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, #{item.groupName},#{item.sceneName}, #{item.idempotentId}, #{item.bizNo}, - #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, + #{item.namespaceId}, #{item.groupName}, #{item.groupId}, #{item.sceneName}, #{item.sceneId}, #{item.idempotentId}, + #{item.bizNo},#{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt}, #{item.bucketIndex}, #{item.parentId}, #{item.deleted} ) diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml index e62db0f87..fa60f1b72 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml @@ -3,14 +3,16 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, + #{item.groupId,jdbcType=BIGINT}, #{item.sceneName,jdbcType=VARCHAR}, + #{item.sceneId,jdbcType=BIGINT}, #{item.idempotentId,jdbcType=VARCHAR}, #{item.bizNo,jdbcType=VARCHAR}, #{item.executorName,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml index 75a464c38..0f362b597 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml @@ -3,7 +3,7 @@ - INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry (namespace_id, group_name, group_id, scene_name, scene_id, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES @@ -11,7 +11,9 @@ ( #{item.namespaceId}, #{item.groupName}, + #{item.groupId}, #{item.sceneName}, + #{item.sceneId}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java index 57ccae474..4d556f87e 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java @@ -125,6 +125,8 @@ public abstract class AbstractGenerator implements TaskGenerator { retry.setGroupName(taskContext.getGroupName()); retry.setSceneName(taskContext.getSceneName()); retry.setRetryStatus(initStatus(taskContext)); + retry.setSceneId(taskContext.getSceneId()); + retry.setGroupId(taskContext.getGroupId()); retry.setParentId(0L); retry.setDeleted(0L); if (StrUtil.isBlank(retry.getBizNo())) { diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportRetryInfoHttpRequestHandler.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportRetryInfoHttpRequestHandler.java index df67f9aea..eef1e6f39 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportRetryInfoHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportRetryInfoHttpRequestHandler.java @@ -123,6 +123,7 @@ public class ReportRetryInfoHttpRequestHandler extends PostHttpRequestHandler { TaskContext taskContext = new TaskContext(); taskContext.setSceneName(sceneName); taskContext.setNamespaceId(namespaceId); + taskContext.setGroupId(groupConfig.getId()); taskContext.setGroupName(groupName); taskContext.setInitScene(groupConfig.getInitScene()); taskContext.setTaskInfos(TaskContextConverter.INSTANCE.toTaskContextInfo(retryTaskDTOS));