diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java index 29a4dbf..39f66b1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class CloudPagerModel { +public class CloudPagerModel implements Serializable { + private static final long serialVersionUID = 3091924006138375461L; @ApiParam("查询对象") private T obj; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java index 282c308..e6cc61a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java @@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; -import java.util.Date; +import java.io.Serializable; /** * @Description : * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态 Table 单元格 + * @Modify: 动态 Table 单元格 **/ @Data -public class DynTableCell { +public class DynTableCell implements Serializable { + private static final long serialVersionUID = 3798664031371975269L; // 单元格名称 private String cellKey; // 排序 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 29b1b17..56e1cb7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -12,12 +13,12 @@ import java.util.Map; * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态Table Row + * @Modify: 动态Table Row **/ @Data -public class DynTableRow { +public class DynTableRow implements Serializable { + private static final long serialVersionUID = 2012638500620164166L; // 是否选中 private boolean isChecked; @@ -31,11 +32,11 @@ public class DynTableRow { private Integer cellSize = 0; // 行数据 - private Map cellMap = new HashMap<>(); + private Map cellMap = new HashMap<>(); - public DynTableRow putCell(DynTableCell cell){ - this.cellMap.put(cell.getCellKey(),cell); + public DynTableRow putCell(DynTableCell cell) { + this.cellMap.put(cell.getCellKey(), cell); return this; } @@ -45,8 +46,10 @@ public class DynTableRow { /** * 禁止外部给 Size 赋值 + * * @param cellSize */ - private void setCellSize(Integer cellSize) { } + private void setCellSize(Integer cellSize) { + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java index 047823a..91b5885 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java @@ -2,9 +2,8 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; -import java.util.ArrayList; +import java.io.Serializable; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -12,14 +11,14 @@ import java.util.Map; * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态Table Row + * @Modify: 动态Table Row **/ @Data -public class ImppDynTable { +public class ImppDynTable implements Serializable { + private static final long serialVersionUID = 6634878862426951453L; // 行数据 - private Map table = new HashMap<>(); + private Map table = new HashMap<>(); // 表单标题 private String tableTitle; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java index 65eebf5..86eba82 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -19,8 +20,9 @@ import java.util.Map; **/ @Data @ApiModel("按钮操作数据模型") -public class BfButtonOperateDataModel { +public class BfButtonOperateDataModel implements Serializable { + private static final long serialVersionUID = 5592739471208814372L; @ApiModelProperty("按钮id") private Long buttonId; @@ -28,7 +30,7 @@ public class BfButtonOperateDataModel { private Long elementId; @ApiModelProperty("操作数据") - private List> operateData; + private List> operateData; @ApiModelProperty("按钮功能关系信息") private BfRefButtonMethod bfRefButtonMethod; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java index 57198b7..74edf0d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java @@ -3,10 +3,9 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.form.bean.BfDataObject; import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty; -import io.swagger.annotations.ApiParam; import lombok.Data; -import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -18,8 +17,9 @@ import java.util.Map; * @Modify: **/ @Data -public class CloudFormModel { +public class CloudFormModel implements Serializable { + private static final long serialVersionUID = -4880909594223592633L; private BfDataObject dataObject; // 数据源编码 @@ -28,38 +28,38 @@ public class CloudFormModel { private String dataObjectCode; // 任何操作必填 必须真实 // 单条插入 - private Map insert; + private Map insert; // 单条修改 - private Map update; + private Map update; // 新增数据 - private List> insertList; + private List> insertList; // 修改条件 // private List updateConditionList; // 修改数据 - private List> updateList; + private List> updateList; // 查询数据 private List selectList; // 删除数据 - private List> deleteList; + private List> deleteList; - private Map delete; + private Map delete; public String orderByParam; public Integer ascOrDesc = 1; - public String orderBy(){ + public String orderBy() { String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { + if (orderByParam != null && orderByParam.trim().length() > 0) { result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; - }else{ + } else { result += " desc"; } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java index d39de03..05ca62a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 数据操作Model * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; * @Modify: **/ @Data -public class ElementFormModel { +public class ElementFormModel implements Serializable { + private static final long serialVersionUID = 3215723235918474591L; //外键关联数据对象主键 @ApiParam(value = "元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index 9954438..b1d2b85 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.form.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -8,8 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -20,8 +18,9 @@ import java.util.List; * @Modify: **/ @Data -public class ElementModel{ +public class ElementModel implements Serializable { + private static final long serialVersionUID = -8009888251366822835L; //外键关联数据对象主键 @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -64,7 +63,7 @@ public class ElementModel{ public String orderByParam; //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc - @ApiParam(value = "排序类型,1 正序,2 倒序",example = "1") + @ApiParam(value = "排序类型,1 正序,2 倒序", example = "1") public Integer ascOrDesc = 1; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java index e8cc46b..eb23800 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -4,16 +4,17 @@ import cn.estsh.i3plus.pojo.form.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** * @Description : 表单模型 * - * 表单功能
- * 布局 功能明细
- * 自定义按钮
- * 元素
- * 元素按钮
+ * 表单功能
+ * 布局 功能明细
+ * 自定义按钮
+ * 元素
+ * 元素按钮
*
* @Reference : * @Author : Adair Peng @@ -21,8 +22,9 @@ import java.util.List; * @Modify: **/ @Data -public class FormModel { +public class FormModel implements Serializable { + private static final long serialVersionUID = 146034689646326300L; // 表单功能 @ApiParam(value = "表单功能") private BfMethod method; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java index 3eb5e7a..d215bb5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -20,8 +21,9 @@ import java.util.Map; @Data @ApiModel("表单操作数据模型") @NoArgsConstructor -public class FormOperateDataModel { +public class FormOperateDataModel implements Serializable { + private static final long serialVersionUID = 7674678844523192310L; @ApiModelProperty("关联标识") private String refId; @@ -36,6 +38,6 @@ public class FormOperateDataModel { private String sourceName; @ApiModelProperty("操作数据集合") - private List> operateDataList; + private List> operateDataList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index ae774f8..bc5daaf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,10 +1,11 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -13,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class SqlColumnModel { -// isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer +public class SqlColumnModel implements Serializable { + private static final long serialVersionUID = -8437573966195980847L; + // isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer // isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 50 getColumnLabel name getColumnName name getSchemaName getPrecision 50 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String // isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel age getColumnName age getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer // isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 19 getColumnLabel date_time getColumnName date_time getSchemaName getPrecision 19 getScale 0 getTableName interceptor getColumnType 93 getColumnTypeName TIMESTAMP getColumnClassName java.sql.Timestamp diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java index a518608..5f03036 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java @@ -1,12 +1,9 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.form.bean.BfDataObject; -import io.swagger.annotations.ApiParam; import lombok.Data; -import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.List; -import java.util.Objects; /** * @Description : @@ -16,8 +13,9 @@ import java.util.Objects; * @Modify: **/ @Data -public class SqlCreateDllModel { +public class SqlCreateDllModel implements Serializable { + private static final long serialVersionUID = -1294648161172538340L; private String tableCat; private String tableSchem; private String tableName; @@ -29,6 +27,6 @@ public class SqlCreateDllModel { private String selfReferencingColName; private String refGeneration; - List columnlist ; + List columnlist; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java index 90d9313..b3dd987 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -16,14 +17,15 @@ import java.util.List; * @Modify: **/ @Data -public class SqlScriptModel { +public class SqlScriptModel implements Serializable { + private static final long serialVersionUID = 512077813851983749L; @ApiParam(value = "对象元素ID") @JsonSerialize(using = ToStringSerializer.class) private Long elementId; @ApiParam(value = "元素内容") - private String elementContent ; + private String elementContent; @ApiParam(value = "动态对象Class") private Class dynClass; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java index c9c9845..9cb7ac3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -13,8 +14,9 @@ import java.util.List; * @Modify: **/ @Data -public class WmsPackageModel { +public class WmsPackageModel implements Serializable { + private static final long serialVersionUID = -6308064202329492679L; List wmsPackageList; } 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 ddcfd44..1911043 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 @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; import lombok.Data; import org.slf4j.LoggerFactory; +import java.io.Serializable; + /** * @Description : lac指令集model * @Reference : @@ -13,8 +15,9 @@ import org.slf4j.LoggerFactory; * @Modify: **/ @Data -public class LacCommandStackModel { +public class LacCommandStackModel implements Serializable { + private static final long serialVersionUID = -8453748548383071954L; /** * 指令集记录id */ @@ -46,17 +49,17 @@ public class LacCommandStackModel { private Exception exception; - public void setException(Exception exception){ - LoggerFactory.getLogger("YYYY").error("异常信息:{}",exception); + public void setException(Exception exception) { + LoggerFactory.getLogger("YYYY").error("异常信息:{}", exception); this.exception = exception; } - public void setCommandStackRecord(LacCommandStackRecord commandStackRecord){ + public void setCommandStackRecord(LacCommandStackRecord commandStackRecord) { this.commandStackRecord = commandStackRecord; this.recordId = commandStackRecord.getId(); } - public Object getTaskRequestParam(LacCommandStackStepTask stepTask){ + public Object getTaskRequestParam(LacCommandStackStepTask stepTask) { for (Task task : this.getRequest().getTaskList()) { // 步骤代码为空时匹配所有任务参数 if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) { @@ -69,8 +72,8 @@ public class LacCommandStackModel { return null; } - public Long getRecordId(){ - if(recordId == null &&this.commandStackRecord !=null){ + public Long getRecordId() { + if (recordId == null && this.commandStackRecord != null) { this.recordId = this.commandStackRecord.getId(); } return recordId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java index 005846b..3977d09 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; + +import java.io.Serializable; import java.util.List; /** @@ -14,8 +16,9 @@ import java.util.List; **/ @Data @XStreamAlias("request") -public class LacSuitRequest { +public class LacSuitRequest implements Serializable { + private static final long serialVersionUID = 9078681515190902399L; /** * 指令集代码 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java index 46a58d5..0a22ea5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; +import java.io.Serializable; + /** * @Description : lac 适配响应信息 * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @XStreamAlias("response") -public class LacSuitResponse { +public class LacSuitResponse implements Serializable { + private static final long serialVersionUID = -4119301611637726729L; /** * 是否成功 */ @@ -35,7 +38,7 @@ public class LacSuitResponse { */ private Object result; - public LacSuitResponse(){ + public LacSuitResponse() { this.success = true; this.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); this.message = ResourceEnumUtil.MESSAGE.SUCCESS.getDescription(); 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 ce9d8c2..143d11d 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 @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @XStreamAlias("task") -public class Task { +public class Task implements Serializable { + private static final long serialVersionUID = 1504165068471696209L; private String code; private String stepCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java index 40bc9c6..2007630 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java @@ -5,6 +5,8 @@ import com.thoughtworks.xstream.annotations.XStreamConverter; import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -14,9 +16,10 @@ import lombok.Data; **/ @Data @XStreamAlias("param") -@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"}) -public class TaskParam { +@XStreamConverter(value = ToAttributedValueConverter.class, strings = {"value"}) +public class TaskParam implements Serializable { + private static final long serialVersionUID = 749532390986966416L; private String name; private String value; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java index 4606b0e..d011da9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.license; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -10,9 +12,10 @@ import lombok.Data; * @Modify: **/ @Data -public class ImppLicenseSenseshield { +public class ImppLicenseSenseshield implements Serializable { + private static final long serialVersionUID = 3227502901235303725L; /** * license_id : 170817 * enable : true diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java index e23b1ad..99af036 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java @@ -4,36 +4,39 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : - * 自定义报表数据源传输对象 , 单纯数据传输使用并不做保存使用 + * 自定义报表数据源传输对象 , 单纯数据传输使用并不做保存使用 * @Reference : * @Author : wei.peng * @CreateDate : 19-12-5 下午4:02 * @Modify: **/ @Data -public class BrDataSourceModel { +public class BrDataSourceModel implements Serializable { /** * 默认数据源信息 */ public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源"); + private static final long serialVersionUID = -5137576929473857749L; - @ApiParam(value ="数据源名称") + @ApiParam(value = "数据源名称") private String sourceName; - @ApiParam(value ="数据源编码") + @ApiParam(value = "数据源编码") private String sourceCode; - @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + @ApiParam(value = "数据源类型", name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") private Integer sourceType; - @ApiParam(value ="数据库名称") + @ApiParam(value = "数据库名称") private String sourceDataBaseName; - @ApiParam(value ="数据源描述") + @ApiParam(value = "数据源描述") private String sourceDescription; public BrDataSourceModel() { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java index 9dc5df5..d0fdd09 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.report.bean.BrReport; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -17,21 +18,22 @@ import java.util.List; * @Modify: **/ @Data -public class BrDynamicPageModel { +public class BrDynamicPageModel implements Serializable { - @ApiParam(value ="报表信息") + private static final long serialVersionUID = -5054183081964783780L; + @ApiParam(value = "报表信息") private BrReport report; - @ApiParam(value ="布局信息") + @ApiParam(value = "布局信息") private BrLayout layout; @ApiParam(value = "报表排版关系") private List refReportList; - @ApiParam(value ="页面元素内容") + @ApiParam(value = "页面元素内容") private List elementList; - @ApiParam(value ="页面元素内容") + @ApiParam(value = "页面元素内容") private List templateModelList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index c29a77b..0df0e9c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -23,17 +23,17 @@ import java.util.Map; public class TemplateModel implements Serializable { private static final long serialVersionUID = -6385070202088819367L; - @ApiParam(value ="视图ID") + @ApiParam(value = "视图ID") @JsonSerialize(using = ToStringSerializer.class) private Long viewId; - @ApiParam(value ="视图类型") + @ApiParam(value = "视图类型") private Integer viewType; - @ApiParam(value ="视图名称") + @ApiParam(value = "视图名称") private String viewName; - @ApiParam(value ="返回信息") + @ApiParam(value = "返回信息") private String resultMessage; @ApiParam(value = "查询对象") @@ -76,7 +76,7 @@ public class TemplateModel implements Serializable { private Pager pager; @ApiParam(value = "页面查询条件") - private Map findParam; + private Map findParam; @ApiParam("执行 HQL ") private String selectSql; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java index b5c8c0a..0be8fb7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.softswitch; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -10,7 +12,8 @@ import lombok.Data; * @Modify: **/ @Data -public class SoftswitchIocModel { +public class SoftswitchIocModel implements Serializable { + private static final long serialVersionUID = 8945557825392215914L; /* Spring Ioc Bean 名称 */ private String beanName; /* Spring Ioc 需要管理的Bean */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 806c17b..7241fe9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -11,6 +11,8 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -20,8 +22,9 @@ import lombok.Data; **/ @Data @XStreamAlias("client") -public class SuitClientModel { +public class SuitClientModel implements Serializable { + private static final long serialVersionUID = -1073627855304303961L; /** * 适配套件代码 */ @@ -62,12 +65,13 @@ public class SuitClientModel { */ private Integer suitMethodId; - public int getSuitMethodIdVal(){ - if(suitMethodId == null){ + public int getSuitMethodIdVal() { + if (suitMethodId == null) { return -1; } return suitMethodId.intValue(); } + /** * 适配状态码 */ @@ -98,7 +102,7 @@ public class SuitClientModel { public SuitClientModel() { } - public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) { + public SuitClientModel(Integer requestSource, BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); @@ -114,7 +118,7 @@ public class SuitClientModel { this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } - public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) { + public SuitClientModel(Integer requestSource, Integer suitMethodId, BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.suitMethodId = suitMethodId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java index 83ac2e0..28de3a4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.softswitch; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -11,8 +13,9 @@ import lombok.Data; * @Modify: **/ @Data -public class SuitImppCloudModel { +public class SuitImppCloudModel implements Serializable { + private static final long serialVersionUID = -8731173690394189107L; @ApiParam(value = "适配器信息") private BsSuitCaseModel model; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java index ec7dd0a..9963d36 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -13,8 +14,9 @@ import java.util.Map; * @Modify: **/ @Data -public class SuitParamModel { +public class SuitParamModel implements Serializable { + private static final long serialVersionUID = -1695550139368764444L; /* 标签名称 */ private String tagName; /* 标签 Class Path */ @@ -36,7 +38,7 @@ public class SuitParamModel { private String type; /* 标签属性 */ - private Map attr; + private Map attr; /* 父节点 */ private SuitParamModel parent; /* 标签子集 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index cb371c4..e859e21 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -24,10 +25,11 @@ import java.util.Map; **/ @Data @XStreamAlias("server") -@XmlRootElement(name ="server") +@XmlRootElement(name = "server") @XmlAccessorType(XmlAccessType.NONE) -public class SuitServerModel { +public class SuitServerModel implements Serializable { + private static final long serialVersionUID = 3501193688956575386L; // 执行方法命令 @XmlElement @ApiParam(value = "适配器code") @@ -43,7 +45,7 @@ public class SuitServerModel { // 传输集合 private List list; // 传输键值对 - private Map map; + private Map map; // 传输 JSON 数据 private String json; @@ -91,13 +93,13 @@ public class SuitServerModel { // @XStreamImplicit private Integer suitMethodId; - public int getSuitMethodIdVal(){ - if(suitMethodId == null){ + public int getSuitMethodIdVal() { + if (suitMethodId == null) { return -1; } return suitMethodId.intValue(); } -// @XStreamImplicit + // @XStreamImplicit private String analyzeMessage; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java index 8f48c15..6729915 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java @@ -4,8 +4,8 @@ import cn.estsh.i3plus.pojo.platform.bean.TestTransUser; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.aspectj.weaver.ast.Test; +import java.io.Serializable; import java.util.List; /** @@ -18,8 +18,9 @@ import java.util.List; @Getter @Setter @ToString -public class TestConstructModel { +public class TestConstructModel implements Serializable { + private static final long serialVersionUID = 3347578209875237950L; private long id; private TestTransUser user;