diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index 1b43256..7ec411c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -76,11 +76,11 @@ public class LacCommandStackStepTask extends BaseBean { /** * 不建议使用 */ - @Deprecated - @Column(name="TASK_INSTANCE_ID") - @ApiParam(value ="任务实例ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long taskInstanceId; +// @Deprecated +// @Column(name="TASK_INSTANCE_ID") +// @ApiParam(value ="任务实例ID") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long taskInstanceId; // // @Column(name="STEP_NAME_RDD") // @ApiParam(value ="步骤名称") @@ -115,6 +115,13 @@ public class LacCommandStackStepTask extends BaseBean { @ApiParam(value ="适配任务记录") private LacLogTask logTask; + public Long getTaskInstanceId(){ + if(lacSuitTask == null){ + return logTask.getId(); + } + return null; + } + public LacCommandStackStepTask() { } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 3cac9ba..abf9368 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -34,8 +34,8 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); return ddlPackBean; } @@ -43,7 +43,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean); return ddlPackBean; } @@ -51,7 +51,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getStepName(), "stepName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getStepCode(), "stepCode", ddlPackBean); return ddlPackBean; } @@ -59,27 +61,29 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getTaskInstanceId(),"taskInstanceId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean); + if (bean == null) { + return ddlPackBean; + } + DdlPreparedPack.getStringLikerPack(bean.getTaskName(), "taskName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskCode(), "taskCode", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List idList) { - DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ; + DdlPackBean ddlPackBean = packHqlLacSuitTask(bean); - DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + DdlPreparedPack.getInPackList(idList, "id", ddlPackBean); return ddlPackBean; } @@ -93,15 +97,18 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List taskIdList) { DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean); - DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + if(bean == null){ + return ddlPackBean; + } + DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); return ddlPackBean; } @@ -109,7 +116,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List taskIdList) { DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean); - DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index c9fb540..0cdedf7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -63,4 +63,11 @@ public class LacCommandStackModel { return null; } + public Long getRecordId(){ + if(recordId == null &&this.commandStackRecord !=null){ + this.recordId = this.commandStackRecord.getId(); + } + return recordId; + } + }