diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 1b2c71a..5859ae1 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -132,6 +132,22 @@ public class LacSuitTask extends BaseBean { private List lacSuitTaskParamList; @Transient + @ApiParam(value ="适配原始参数") + private Object orginParam; + + @Transient + @ApiParam(value ="适配转换后参数") + private Object transParam; + + @Transient + @ApiParam(value ="原始报文") + private Object orginMessage; + + @Transient + @ApiParam(value ="转换后报文") + private Object transMessage; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; 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 c141c5a..c9fb540 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 @@ -1,13 +1,8 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; import lombok.Data; -import org.apache.commons.lang3.StringUtils; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * @Description : lac指令集model @@ -35,23 +30,14 @@ public class LacCommandStackModel { private LacSuitRequest request; /** - * 响应数据 - */ - private LacSuitResponse response; - - /** - * 任务原始报文 - * key : 任务编号 - * value : 原始报文 + * 请求XML */ - private Map orginMessageMap = new ConcurrentHashMap<>(); + private String requestXml; /** - * 任务转换后报文 - * key : 任务编号 - * value : 转换后报文 + * 响应数据 */ - private Map transMessageMap = new ConcurrentHashMap<>(); + private LacSuitResponse response; /** * 异常信息 @@ -68,7 +54,7 @@ public class LacCommandStackModel { this.recordId = commandStackRecord.getId(); } - public List getTaskRequestParam(String taskCode){ + public Object getTaskRequestParam(String taskCode){ for (Task task : this.getRequest().getTaskList()) { if(task.getCode().equals(taskCode)){ return task.getParamList(); @@ -77,17 +63,4 @@ public class LacCommandStackModel { return null; } - public void putOrginMessage(LacSuitTask lacSuitTask,Object orginMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.orginMessageMap.put(lacSuitTask.getTaskInstanceId(), orginMessage == null ? StringUtils.EMPTY : orginMessage); - } - public void putTransMessage(LacSuitTask lacSuitTask,Object transMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.transMessageMap.put(lacSuitTask.getTaskInstanceId(), transMessage == null ? StringUtils.EMPTY : transMessage); - } - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index 3ea6970..839e2e3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.lac; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; -import java.util.List; /** * @Description : @@ -17,5 +16,5 @@ public class Task { private String code; - private List paramList; + private Object paramList; }