diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java index 90bd8d6d..59543e0d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java @@ -38,8 +38,6 @@ public class EnvironmentDTO extends BaseDTO { @Schema(description = "部署方式:K8S-Kubernetes集群部署, DOCKER-Docker容器部署, VM-虚拟机部署") private DeployTypeEnum deployType; - private JsonNode config; - @Schema(description = "排序号") @NotNull(message = "排序号不能为空") private Integer sort; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java index 547e9b03..6ad8c632 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java @@ -26,6 +26,8 @@ import java.lang.reflect.Field; import java.util.Map; import com.qqchen.deploy.backend.workflow.annotation.SchemaProperty; +import com.qqchen.deploy.backend.workflow.annotation.SchemaPropertyDataSource; +import com.qqchen.deploy.backend.workflow.annotation.SchemaPropertyDataSourceParam; /** * 工作流节点定义服务实现 @@ -206,6 +208,12 @@ public class WorkflowNodeDefinitionServiceImpl extends BaseServiceImpl 0) { + ArrayNode dependsOnNode = dataSourceNode.putArray("dependsOn"); + for (String depend : dependsOn) { + dependsOnNode.add(depend); + } + } + + // 处理请求参数 + SchemaPropertyDataSourceParam[] params = dataSource.params(); + if (params != null && params.length > 0) { + ObjectNode paramsNode = dataSourceNode.putObject("params"); + for (SchemaPropertyDataSourceParam param : params) { + paramsNode.put(param.name(), param.value()); + } + } + +// // 处理其他可选属性 +// if (!dataSource.method().isEmpty()) { +// dataSourceNode.put("method", dataSource.method()); +// } +// if (!dataSource.searchField().isEmpty()) { +// dataSourceNode.put("searchField", dataSource.searchField()); +// } + } + /** * 获取类的所有字段,包括父类的字段 */ @@ -228,7 +278,7 @@ public class WorkflowNodeDefinitionServiceImpl extends BaseServiceImpl