POJO添加序列化id

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<T> {
+public class CloudPagerModel<T> implements Serializable {
 
+    private static final long serialVersionUID = 3091924006138375461L;
     @ApiParam("查询对象")
     private T obj;
 

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:
+ * @Modify: 动态 Table 单元格
- *  动态 Table 单元格
  **/
 @Data
-public class DynTableCell {
+public class DynTableCell implements Serializable {
 
+    private static final long serialVersionUID = 3798664031371975269L;
     // 单元格名称
     private String cellKey;
     // 排序

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:
+ * @Modify: 动态Table Row
- *      动态Table Row
  **/
 @Data
-public class DynTableRow {
+public class DynTableRow implements Serializable {
 
+    private static final long serialVersionUID = 2012638500620164166L;
     // 是否选中
     private boolean isChecked;
 
@@ -45,8 +46,10 @@ public class DynTableRow {
 
     /**
      * 禁止外部给 Size 赋值
+     *
      * @param cellSize
      */
-    private void setCellSize(Integer cellSize) { }
+    private void setCellSize(Integer cellSize) {
+    }
 
 }

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,12 +11,12 @@ import java.util.Map;
  * @Reference :
  * @Author : Adair Peng
  * @CreateDate : 2018-12-11 15:37
- * @Modify:
+ * @Modify: 动态Table Row
- *      动态Table Row
  **/
 @Data
-public class ImppDynTable {
+public class ImppDynTable implements Serializable {
 
+    private static final long serialVersionUID = 6634878862426951453L;
     // 行数据
     private Map<String, DynTableRow> table = new HashMap<>();
 

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;
 

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;
 
     // 数据源编码

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)

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 java.io.Serializable;
-import javax.persistence.Transient;
 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)

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.form.bean.*;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -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;

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;
 

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,7 +14,8 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class SqlColumnModel {
+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

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;

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,8 +17,9 @@ 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;

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<WmsPackage> wmsPackageList;
 
 }

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
      */

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;
     /**
      * 指令集代码
      */

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;
     /**
      * 是否成功
      */

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;

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 :
@@ -15,8 +17,9 @@ import lombok.Data;
 @Data
 @XStreamAlias("param")
 @XStreamConverter(value = ToAttributedValueConverter.class, strings = {"value"})
-public class TaskParam {
+public class TaskParam implements Serializable {
 
+    private static final long serialVersionUID = 749532390986966416L;
     private String name;
 
     private String value;

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

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用
@@ -13,13 +15,14 @@ import lombok.Data;
  * @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 = "数据源名称")
     private String sourceName;

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,8 +18,9 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class BrDynamicPageModel {
+public class BrDynamicPageModel implements Serializable {
 
+    private static final long serialVersionUID = -5054183081964783780L;
     @ApiParam(value = "报表信息")
     private BrReport report;
 

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 */

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;
     /**
      * 适配套件代码
      */
@@ -68,6 +71,7 @@ public class SuitClientModel {
         }
         return suitMethodId.intValue();
     }
+
     /**
      * 适配状态码
      */

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;
 

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 */

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;
 
@@ -26,8 +27,9 @@ import java.util.Map;
 @XStreamAlias("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")

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;