反序列化问题。
This commit is contained in:
parent
05c7ff74f8
commit
684e682bcd
@ -43,8 +43,8 @@ public class WorkflowNodeDefinitionDTO extends BaseDTO {
|
|||||||
private JsonNode localVariablesSchema;
|
private JsonNode localVariablesSchema;
|
||||||
|
|
||||||
@Schema(description = "节点表单")
|
@Schema(description = "节点表单")
|
||||||
private JsonNode fromVariablesSchema;
|
private JsonNode formVariablesSchema;
|
||||||
|
|
||||||
@Schema(description = "是否启用")
|
@Schema(description = "是否启用")
|
||||||
private Boolean enabled;
|
private Boolean enabled = true;
|
||||||
}
|
}
|
||||||
@ -1,6 +1,7 @@
|
|||||||
package com.qqchen.deploy.backend.workflow.dto;
|
package com.qqchen.deploy.backend.workflow.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.qqchen.deploy.backend.workflow.enums.NodeCategoryEnums;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -17,6 +18,9 @@ public class WorkflowNodeTypeDefinedDTO {
|
|||||||
@Schema(description = "节点名称")
|
@Schema(description = "节点名称")
|
||||||
private String nodeName;
|
private String nodeName;
|
||||||
|
|
||||||
|
@Schema(description = "节点分类")
|
||||||
|
private NodeCategoryEnums category;
|
||||||
|
|
||||||
@Schema(description = "节点属性变量JSON SCHEMA")
|
@Schema(description = "节点属性变量JSON SCHEMA")
|
||||||
private JsonNode panelVariablesSchema;
|
private JsonNode panelVariablesSchema;
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@ public class WorkflowNodeDefinition extends Entity<Long> {
|
|||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
@Enumerated(EnumType.STRING)
|
@Enumerated(EnumType.STRING)
|
||||||
@Column(nullable = false)
|
@Column(name = "category")
|
||||||
private NodeCategoryEnums category;
|
private NodeCategoryEnums category;
|
||||||
|
|
||||||
|
|
||||||
@ -51,8 +51,8 @@ public class WorkflowNodeDefinition extends Entity<Long> {
|
|||||||
private JsonNode localVariablesSchema;
|
private JsonNode localVariablesSchema;
|
||||||
|
|
||||||
@Type(JsonType.class)
|
@Type(JsonType.class)
|
||||||
@Column(name = "from_variables_schema", columnDefinition = "text", nullable = false)
|
@Column(name = "form_variables_schema", columnDefinition = "text", nullable = false)
|
||||||
private JsonNode fromVariablesSchema;
|
private JsonNode formVariablesSchema;
|
||||||
|
|
||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
private Boolean enabled = true;
|
private Boolean enabled = true;
|
||||||
|
|||||||
@ -37,17 +37,6 @@ public class WorkflowNodeDefinitionServiceImpl extends BaseServiceImpl<WorkflowN
|
|||||||
@Resource
|
@Resource
|
||||||
private IWorkflowNodeDefinitionRepository workflowNodeDefinitionRepository;
|
private IWorkflowNodeDefinitionRepository workflowNodeDefinitionRepository;
|
||||||
|
|
||||||
@Override
|
|
||||||
public WorkflowNodeDefinitionDTO create(WorkflowNodeDefinitionDTO dto) {
|
|
||||||
// return super.create(dto);
|
|
||||||
|
|
||||||
NodeTypeEnums nodeTypeEnums = NodeTypeEnums.fromValue(dto.getNodeType().getCode());
|
|
||||||
|
|
||||||
System.out.println(dto);
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WorkflowNodeDefinitionDTO getByType(String type) {
|
public WorkflowNodeDefinitionDTO getByType(String type) {
|
||||||
return workflowNodeDefinitionRepository.findByNodeTypeAndEnabledTrue(type)
|
return workflowNodeDefinitionRepository.findByNodeTypeAndEnabledTrue(type)
|
||||||
@ -103,6 +92,7 @@ public class WorkflowNodeDefinitionServiceImpl extends BaseServiceImpl<WorkflowN
|
|||||||
WorkflowNodeTypeDefinedDTO definedDTO = new WorkflowNodeTypeDefinedDTO();
|
WorkflowNodeTypeDefinedDTO definedDTO = new WorkflowNodeTypeDefinedDTO();
|
||||||
definedDTO.setNodeCode(nodeType.getCode());
|
definedDTO.setNodeCode(nodeType.getCode());
|
||||||
definedDTO.setNodeName(nodeType.getName());
|
definedDTO.setNodeName(nodeType.getName());
|
||||||
|
definedDTO.setCategory(nodeType.getCategory());
|
||||||
Class<?> panelVariables = nodeType.getPanelVariables();
|
Class<?> panelVariables = nodeType.getPanelVariables();
|
||||||
if (panelVariables != null) {
|
if (panelVariables != null) {
|
||||||
definedDTO.setPanelVariablesSchema(generateSchema(panelVariables));
|
definedDTO.setPanelVariablesSchema(generateSchema(panelVariables));
|
||||||
|
|||||||
@ -445,11 +445,11 @@ CREATE TABLE workflow_node_definition
|
|||||||
node_code VARCHAR(50) NOT NULL COMMENT '节点编码',
|
node_code VARCHAR(50) NOT NULL COMMENT '节点编码',
|
||||||
node_name VARCHAR(100) NOT NULL COMMENT '节点名称',
|
node_name VARCHAR(100) NOT NULL COMMENT '节点名称',
|
||||||
description VARCHAR(500) COMMENT '节点描述',
|
description VARCHAR(500) COMMENT '节点描述',
|
||||||
category VARCHAR(50) NOT NULL COMMENT '节点分类',
|
category VARCHAR(50) COMMENT '节点分类',
|
||||||
ui_variables JSON NOT NULL COMMENT '节点UI',
|
ui_variables JSON NOT NULL COMMENT '节点UI',
|
||||||
panel_variables_schema JSON NOT NULL COMMENT '节点属性',
|
panel_variables_schema JSON NOT NULL COMMENT '节点属性',
|
||||||
local_variables_schema JSON NOT NULL COMMENT '节点环境变量',
|
local_variables_schema JSON NOT NULL COMMENT '节点环境变量',
|
||||||
from_variables_schema JSON COMMENT '节点表单',
|
form_variables_schema JSON COMMENT '节点表单',
|
||||||
enabled BOOLEAN NOT NULL DEFAULT TRUE COMMENT '是否启用',
|
enabled BOOLEAN NOT NULL DEFAULT TRUE COMMENT '是否启用',
|
||||||
|
|
||||||
create_time DATETIME NOT NULL COMMENT '创建时间',
|
create_time DATETIME NOT NULL COMMENT '创建时间',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user