gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(1.5.0-beta1): 新增sceneId和groupId

Browse Source
This commit is contained in:
opensnail 2025-04-09 23:24:14 +08:00
parent cf91d88ac2
commit 07fe8283a9
16 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml
View File

@ -3,14 +3,16 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryDeadLetterMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="item" separator=",">
(
#{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},

10
snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml
View File

@ -3,16 +3,16 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="item" separator=",">
(
#{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}
)
</foreach>
</insert>

4
snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml
View File

@ -3,14 +3,16 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryDeadLetterMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="item" separator=",">
(
#{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},

6
snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml
View File

@ -4,14 +4,14 @@
<!-- 定义批量新增的 SQL 映射 -->
<insert id="insertBatch" parameterType="java.util.List">
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
<foreach collection="list" item="item" separator=",">
(
#{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}

4
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml
View File

@ -3,14 +3,16 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryDeadLetterMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="item" separator=",">
(
#{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},

4
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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},

4
snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml
View File

@ -3,14 +3,16 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryDeadLetterMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="item" separator=",">
(
#{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},

4
snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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},

4
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml
View File

@ -3,13 +3,15 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryDeadLetterMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false">
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)
<foreach collection="list" item="item" separator="UNION ALL">
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},

5
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml
View File

@ -3,12 +3,13 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false">
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)
<foreach collection="list" item="item" separator="UNION ALL">
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}

4
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml
View File

@ -3,14 +3,16 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryDeadLetterMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="item" separator=",">
(
#{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},

6
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml
View File

@ -4,14 +4,14 @@
<!-- 定义批量新增的 SQL 映射 -->
<insert id="insertBatch" parameterType="java.util.List">
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
<foreach collection="list" item="item" separator=",">
(
#{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}
)
</foreach>

4
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml
View File

@ -3,14 +3,16 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryDeadLetterMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="item" separator=",">
(
#{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},

4
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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},

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/generator/retry/AbstractGenerator.java
View File

@ -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())) {

1
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportRetryInfoHttpRequestHandler.java
View File

@ -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));