From c6dd19a16b5f95c35ec8094f7c2f913ac0cf7f11 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 11 Apr 2024 19:32:11 +0800 Subject: [PATCH] feature: update workflow task dag --- .../dto/WorkflowTaskDefinitionAttrs.java | 3 ++ .../mysql/init.d/scaleph-workflow-mysql.sql | 30 +++++++++++-------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/dto/WorkflowTaskDefinitionAttrs.java b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/dto/WorkflowTaskDefinitionAttrs.java index 418cae98b..7bc9d347a 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/dto/WorkflowTaskDefinitionAttrs.java +++ b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/dto/WorkflowTaskDefinitionAttrs.java @@ -26,6 +26,9 @@ @Data public class WorkflowTaskDefinitionAttrs { + @Schema(description = "refered workflow definition id") + private Long referenceWorkflowDefinitionId; + @Schema(description = "workflow task param") private Map param; diff --git a/tools/docker/mysql/init.d/scaleph-workflow-mysql.sql b/tools/docker/mysql/init.d/scaleph-workflow-mysql.sql index a7ab5bfe4..f57122f42 100644 --- a/tools/docker/mysql/init.d/scaleph-workflow-mysql.sql +++ b/tools/docker/mysql/init.d/scaleph-workflow-mysql.sql @@ -68,20 +68,23 @@ VALUES (4, '0', 'FlinkJobStatusSyncJob2', '1', '0', NULL, NULL, 7, 'sys', 'sys') DROP TABLE IF EXISTS `workflow_instance`; CREATE TABLE `workflow_instance` ( - `id` BIGINT NOT NULL AUTO_INCREMENT, - `workflow_definition_id` BIGINT NOT NULL, - `dag_id` BIGINT NOT NULL, - `task_id` VARCHAR(128), - `state` VARCHAR(4) NOT NULL, - `start_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, - `end_time` DATETIME, - `message` TEXT, - `creator` VARCHAR(32), - `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, - `editor` VARCHAR(32), - `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `id` BIGINT NOT NULL AUTO_INCREMENT, + `parent_workflow_instance_id` BIGINT, + `workflow_definition_id` BIGINT NOT NULL, + `dag_id` BIGINT NOT NULL, + `trigger` VARCHAR(255) COMMENT '触发原因', + `task_id` VARCHAR(128), + `state` VARCHAR(4) NOT NULL, + `start_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `end_time` DATETIME, + `outputs` TEXT, + `message` TEXT, + `creator` VARCHAR(32), + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `editor` VARCHAR(32), + `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), - KEY `idx_workflow_definition` (`workflow_definition_id`) + KEY `idx_workflow_definition` (`workflow_definition_id`) ) ENGINE = InnoDB COMMENT ='workflow instance'; DROP TABLE IF EXISTS `workflow_task_instance`; @@ -94,6 +97,7 @@ CREATE TABLE `workflow_task_instance` `stage` VARCHAR(4) NOT NULL, `start_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `end_time` DATETIME, + `outputs` TEXT, `message` TEXT, `creator` VARCHAR(32), `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,