From 8f07751100bedb282f9ff7a0c517740012be01ec Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 19 Nov 2019 12:00:54 +0800 Subject: [PATCH] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 19 ++++++++++++++++++- .../estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java | 5 ----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index 4ebc6e9..9b32ffa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -124,7 +124,24 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="执行说明") private String executionDescription; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackRecord record; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackTemplate template; + + @Transient + @ApiParam(value ="任务步骤") + private LacCommandStackStep step; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackStepTask stackStepTask; + @Transient - @ApiParam(value ="步骤列表") + @ApiParam(value ="执行任务参数") private List detailList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index d2b3cd2..fb27a2b 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -69,11 +69,6 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskTypeId; - @Column(name="TASK_NAME_TYPE") - @ApiParam(value ="任务类型") - @JsonSerialize(using = ToStringSerializer.class) - private Long taskNameType; - @Column(name="adapterId") @ApiParam(value ="适配器ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class)