diff --git a/common/src/main/java/com/sdm/common/entity/pojo/capability/CapPoolTask.java b/common/src/main/java/com/sdm/common/entity/pojo/capability/CapPoolTask.java index 499d47af..4078a9c5 100644 --- a/common/src/main/java/com/sdm/common/entity/pojo/capability/CapPoolTask.java +++ b/common/src/main/java/com/sdm/common/entity/pojo/capability/CapPoolTask.java @@ -21,5 +21,5 @@ public class CapPoolTask extends BaseEntity { private String section; private String chamber; private String performanceGroup; - private String flowTemplateName; + private String flowTemplate; } diff --git a/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBase.java b/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBase.java index cfb051be..0b403df7 100644 --- a/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBase.java +++ b/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBase.java @@ -23,7 +23,7 @@ public class TaskBase extends BaseEntity { private int noticeStatus; private int approveStatus; private int confirmStatus; - private String flowTemplateName; + private String flowTemplate; private String description; private int type; private String code; diff --git a/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java b/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java index e1178e9f..e58a5191 100644 --- a/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java +++ b/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java @@ -31,7 +31,7 @@ public class TaskRunsRsp { private long resultTaskId; private int isBase; private Long updater; - private String flowTemplateName; + private String flowTemplate; private String createTime; private List children = new ArrayList<>(); diff --git a/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java b/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java index e239ebdc..cecb40df 100644 --- a/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java +++ b/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java @@ -787,7 +787,7 @@ public class PbsServiceImpl implements PbsService { taskInfo.setEnglishName(task.getEnglishName()); taskInfo.setUpdater(task.getUpdater()); taskInfo.setNodeId(node.getId()); - taskInfo.setFlowTemplateName(task.getFlowTemplateName()); + taskInfo.setFlowTemplate(task.getFlowTemplate()); List runs = pbsMapper.getPbsRunByTaskId(task.getId()); List runInfos = new ArrayList<>(); if (!CollectionUtils.isEmpty(runs)) { diff --git a/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java b/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java index fad6b811..b0006d4f 100644 --- a/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java +++ b/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java @@ -206,7 +206,7 @@ public class ProjectNode extends BaseEntity { private String group; @JsonProperty(value = "bCapacity") private String bCapacity; - private String flowTemplateName; + private String flowTemplate; private String englishName; private List analyseSoftwareList; diff --git a/project/src/main/java/com/sdm/project/model/bo/TaskNode.java b/project/src/main/java/com/sdm/project/model/bo/TaskNode.java index d4ea2df6..1570d7d9 100644 --- a/project/src/main/java/com/sdm/project/model/bo/TaskNode.java +++ b/project/src/main/java/com/sdm/project/model/bo/TaskNode.java @@ -229,7 +229,7 @@ public class TaskNode extends BaseEntity { private String group; @JsonProperty(value = "bCapacity") private String bCapacity; - private String flowTemplateName; + private String flowTemplate; @JsonProperty(value = "tag1") private List tag1; diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationRun.java b/project/src/main/java/com/sdm/project/model/entity/SimulationRun.java index 7a1c67d5..f2142212 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationRun.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationRun.java @@ -62,9 +62,13 @@ public class SimulationRun implements Serializable { @TableField("currentStep") private Integer currentStep; + @ApiModelProperty(value = "当前的流程步骤名称") + @TableField("currentStepName") + private String currentStepName; + @ApiModelProperty(value = "Run执行结果 0:gray 1:red 2:yellow 3:green") - @TableField("result") - private Integer result; + @TableField("achieveStatus") + private Integer achieveStatus; @ApiModelProperty(value = "run描述信息") @TableField("description") diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java index b00ec109..1a1f3cd4 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java @@ -155,8 +155,8 @@ public class SimulationTask implements Serializable { private String bCapacity; @ApiModelProperty(value = "任务流程模板") - @TableField("flowTemplateName") - private String flowTemplateName; + @TableField("flowTemplate") + private String flowTemplate; @TableField("englishName") private String englishName; diff --git a/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java b/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java index a02389d4..f55106a5 100644 --- a/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java +++ b/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java @@ -154,7 +154,7 @@ public class TaskNodePo extends NodeAllBase { // private String group; private String groupName; private String bCapacity; - private String flowTemplateName; + private String flowTemplate; private String englishName; private String description; diff --git a/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java b/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java index d412a8d9..102f7801 100644 --- a/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java +++ b/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java @@ -263,7 +263,7 @@ public class TaskEditNodeReq extends BaseEntity { private String group; @JsonProperty(value = "bCapacity") private String bCapacity; - private String flowTemplateName; + private String flowTemplate; private String englishName; private String performanceType; diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java index 1abc2bfd..136d4f21 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java @@ -100,7 +100,7 @@ public class SpdmNewTaskVo extends BaseEntity { private String groupName; @JsonProperty(value = "bCapacity") private String bCapacity; - private String flowTemplateName; + private String flowTemplate; private String englishName; diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java index b3b7baf7..0f3f62ed 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java @@ -101,7 +101,7 @@ public class SpdmTaskVo extends BaseEntity { private String groupName; @JsonProperty(value = "bCapacity") private String bCapacity; - private String flowTemplateName; + private String flowTemplate; private String englishName; diff --git a/project/src/main/resources/mapper/SimulationProjectMapper.xml b/project/src/main/resources/mapper/SimulationProjectMapper.xml index 37fd2630..c8eed2a6 100644 --- a/project/src/main/resources/mapper/SimulationProjectMapper.xml +++ b/project/src/main/resources/mapper/SimulationProjectMapper.xml @@ -35,11 +35,11 @@ insert into simulation_task (uuid,task_name,task_code,task_pool_name,task_pool_version,node_id,days,standard,fold_id,status,achieve_status,begin_time,end_time,progress,exe_status,confidence,analyse_target,analyse_software,description,difficult,tenant_id - ,creator,create_time,department,sectionName,groupName,bCapacity,flowTemplateName,englishName,demand_id,tag1,tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10) values + ,creator,create_time,department,sectionName,groupName,bCapacity,flowTemplate,englishName,demand_id,tag1,tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10) values (#{it.uuid},#{it.taskName},#{it.taskCode},'','',#{it.nodeId},#{it.days},#{it.standard},'',1,0, #{it.beginTime},#{it.endTime},0,1,#{it.confidence},#{it.analyseTarget},#{it.analyseSoftwares},#{it.description},#{it.difficult},#{it.tenantId}, - #{it.creator},#{it.createTime},#{it.department},#{it.section},#{it.group},#{it.bCapacity},#{it.flowTemplateName},#{it.englishName},#{it.demandId},#{it.tag1,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag2,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, + #{it.creator},#{it.createTime},#{it.department},#{it.section},#{it.group},#{it.bCapacity},#{it.flowTemplate},#{it.englishName},#{it.demandId},#{it.tag1,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag2,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, #{it.tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, #{it.tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, #{it.tag7,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag8,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, @@ -186,8 +186,8 @@ update_time = #{taskNode.updateTime}, - - flowTemplateName = #{taskNode.flowTemplateName}, + + flowTemplate = #{taskNode.flowTemplate}, diff --git a/task/src/main/java/com/sdm/task/model/entity/SimulationTask.java b/task/src/main/java/com/sdm/task/model/entity/SimulationTask.java index 7de358e3..f7c40827 100644 --- a/task/src/main/java/com/sdm/task/model/entity/SimulationTask.java +++ b/task/src/main/java/com/sdm/task/model/entity/SimulationTask.java @@ -117,5 +117,9 @@ public class SimulationTask implements Serializable { @TableField("tenant_id") private String tenantId; + @TableField("flowTemplate") + private String flowTemplate; + @TableField("englishName") + private String englishName; } diff --git a/task/src/main/resources/mapper/TaskMapper.xml b/task/src/main/resources/mapper/TaskMapper.xml index 0dc3e4e5..1cfeee3e 100644 --- a/task/src/main/resources/mapper/TaskMapper.xml +++ b/task/src/main/resources/mapper/TaskMapper.xml @@ -7,7 +7,7 @@ progress,exe_status,notice_status,approve_status,confirm_status,flow_template_name,description,type,code,creator,company) values (#{base.id},#{base.taskName},#{base.englishName},#{base.taskPoolName},#{base.days},#{base.standard},#{base.taskPath},#{base.workRate},#{base.status},#{base.planBeginTime},#{base.planEndTime}, - #{base.finishTime},#{base.progress},#{base.exeStatus},#{base.noticeStatus},#{base.approveStatus},#{base.confirmStatus},#{base.flowTemplateName},#{base.description},#{base.type},#{base.code},#{base.creator},#{company}) + #{base.finishTime},#{base.progress},#{base.exeStatus},#{base.noticeStatus},#{base.approveStatus},#{base.confirmStatus},#{base.flowTemplate},#{base.description},#{base.type},#{base.code},#{base.creator},#{company})