POJO添加序列化id

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -31,6 +31,8 @@ import java.io.Serializable;
 //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     //此处使用hibernate的主键策略方式
     //手动设置,使用iplus-platform-common中的idtool生成
     //将Long类型系列化成String避免精度丢失

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -39,6 +39,8 @@ public class CommonEnumUtil {
         LAC(26, 8600, 13, "lac", "连接适配器"),
         ANDON(27, 8500, 14, "andon", "安灯"),
         APS(28, 8400, 15, "i3aps", "高级计划与排产"),
+
+        MDM(29, 8150, 22, "i3mdm", "数据中心MDM"),
         CENTER(99, 8000, 1, "icloud-server", "注册中心"),
         SURFACE(98, 0, 0, "i3surface", "对外服务"),
         CLOUD(97, 0, 0, "i3cloud", "微服务"),

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "表单按钮", description = "表单按钮")
 public class BfButton extends BaseBean {
 
+    private static final long serialVersionUID = -1675967061983417558L;
     @Column(name = "BUTTON_NAME")
     @ApiParam(value = "按钮名称")
     private String buttonName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value="级联元素",description = "级联元素")
 public class BfCascade extends BaseBean {
 
+    private static final long serialVersionUID = -2114224803602089395L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="级联元素明细",description = "级联元素")
 public class BfCascadeDetail extends BaseBean {
 
+    private static final long serialVersionUID = -8365699249398175846L;
     @Column(name = "CASCADE_ID")
     @ApiParam(value = "级联ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Api(value="数据对象",description = "原数据对象，最原始数据")
 public class BfDataObject extends BaseBean {
 
+    private static final long serialVersionUID = -6450328805517462673L;
     @Column(name = "DATA_SOURCE_ID")
     @ApiParam(value = "数据源ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value = "数据对象属性表", description = "数据对象的属性明细表")
 public class BfDataObjectProperty extends BaseBean {
 
+    private static final long serialVersionUID = 2607149135728621568L;
     //外键关联数据对象主键
     @Column(name = "DATA_OBJECT_ID")
     @ApiParam(value = "数据对象ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Api(value="数据对象",description = "原数据对象，最原始数据")
 public class BfDataSource extends BaseBean {
 
+    private static final long serialVersionUID = -749606489129498769L;
     @Column(name="SOURCE_NAME")
     @ApiParam(value ="数据源名称")
     private String sourceName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value = "对象元素基础", description = "元素基础表")
 public class BfElement extends BaseBean {
 
+    private static final long serialVersionUID = -3309080566388373068L;
     //外键关联数据对象主键
     @Column(name = "ELEMENT_INFO_ID")
     @ApiParam(value = "对象元素明细ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api(value = "元素约束", description = "元素约束")
 public class BfElementConstraint  extends BaseBean {
 
+    private static final long serialVersionUID = 6951083749548881908L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api(value = "对象元素表格", description = "对象元素表格")
 public class BfElementGrid extends BaseBean {
 
+    private static final long serialVersionUID = -3730288075103132153L;
     //外键关联数据对象主键
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -32,6 +32,7 @@ import javax.persistence.Transient;
 @Api(value="对象元素属性",description = "对象元素属性 相当于数据对象属性的扩展")
 public class BfElementProperty extends BaseBean {
 
+    private static final long serialVersionUID = 8391877375302721425L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
 public class BfElementPropertyVirtual extends BaseBean {
 
+    private static final long serialVersionUID = -8746243539245788738L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api(value = "对象元素基础", description = "元素基础表")
 public class BfElementTree extends BaseBean {
 
+    private static final long serialVersionUID = -6173269177770192337L;
     //外键关联数据对象主键
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="拦截器主体")
 public class BfIntercept extends BaseBean {
 
+    private static final long serialVersionUID = -7880837699871138830L;
     @Column(name="INTERCEPT_NAME")
     @ApiParam(value ="拦截器名称")
     private String interceptName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api(value="拦截器明细")
 public class BfInterceptDetail extends BaseBean {
 
+    private static final long serialVersionUID = -2813973524088674573L;
     @Column(name="INTERCEPT_ID")
     @ApiParam(value ="拦截器id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.util.List;
@@ -28,6 +27,7 @@ import java.util.List;
 @Api(value = "自定义表单布局")
 public class BfLayout extends BaseBean {
 
+    private static final long serialVersionUID = 4951428858633293563L;
     @Column(name = "LAYOUT_NAME")
     @ApiParam(value = "名称")
     private String layoutName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value = "自定义表单布局-列")
 public class BfLayoutColumn extends BaseBean {
 
+    private static final long serialVersionUID = -8711414349182712011L;
     @Column(name = "LAYOUT_ID")
     @ApiParam(value = "布局主键")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.util.List;
@@ -30,6 +29,7 @@ import java.util.List;
 @Api(value = "自定义表单布局-行")
 public class BfLayoutRow extends BaseBean {
 
+    private static final long serialVersionUID = -3327441937912038000L;
     @Column(name = "LAYOUT_ID")
     @ApiParam(value = "布局主键")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="表单菜单目录",description = "表单菜单目录")
 public class BfMenu extends BaseBean {
 
+    private static final long serialVersionUID = 6559248298739431579L;
     @Column(name="MENU_NAME")
     @ApiParam(value ="菜单名称")
     private String menuName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="表单功能",description = "表单功能")
 public class BfMethod extends BaseBean {
 
+    private static final long serialVersionUID = 6976569600026342045L;
     @Column(name="METHOD_NAME")
     @ApiParam(value ="功能名称")
     private String methodName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="表单功能明细",description = "表单功能明细")
 public class BfMethodDetail extends BaseBean {
 
+    private static final long serialVersionUID = 3982619673130000003L;
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
 public class BfMethodDetailProperty extends BaseBean {
 
+    private static final long serialVersionUID = -7541677357317732343L;
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api(value="按钮功能关系",description = "按钮功能关系")
 public class BfRefButtonMethod extends BaseBean {
 
+    private static final long serialVersionUID = 1145541515189800147L;
     @Column(name="BUTTON_ID")
     @ApiParam(value ="按钮id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
 public class BfRefElementPropertyVirtualDetail extends BaseBean {
 
+    private static final long serialVersionUID = 3315763374468711786L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "功能角色关系", description = "功能角色关系")
 public class BfRefMethodRole extends BaseBean {
 
+    private static final long serialVersionUID = 8134565165534099843L;
     @Column(name = "METHOD_ID")
     @ApiParam(value = "表单功能id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ics.bean;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -13,8 +14,9 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class IcsActuatorMetrics {
+public class IcsActuatorMetrics implements Serializable {
 
+    private static final long serialVersionUID = 4341201186821752353L;
     private String name;
     private List<Measurements> measurements;
     private List<AvailableTags> availableTags;

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -16,8 +17,9 @@ import java.util.List;
  **/
 @Data
 @ApiModel("应用信息")
-public class IcsApplication {
+public class IcsApplication implements Serializable {
 
+    private static final long serialVersionUID = -1923997516217683087L;
     @ApiModelProperty("应用名称")
     private String appName;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -14,8 +16,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例信息")
-public class IcsInstance {
+public class IcsInstance implements Serializable {
 
+    private static final long serialVersionUID = 2648298051066693374L;
     @ApiModelProperty("实例id")
     private String instanceId;
 
@@ -31,7 +34,7 @@ public class IcsInstance {
     @ApiModelProperty("状态时间")
     private String statusTimeStampStr;
 
-    public String getInstanceStatusTxt(){
-        return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
+    public String getInstanceStatusTxt() {
+        return instanceStatus == null ? "无" : CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
     }
 }

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 实例明细
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例明细")
-public class IcsInstanceDetail {
+public class IcsInstanceDetail implements Serializable {
 
+    private static final long serialVersionUID = -348649782622051827L;
     @ApiModelProperty("pid")
     private String pid;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 实例堆内存
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例堆内存")
-public class IcsInstanceMemoryHeap {
+public class IcsInstanceMemoryHeap implements Serializable {
 
+    private static final long serialVersionUID = -5982536759101768884L;
     @ApiModelProperty("堆使用的内存")
     private double heapMemoryUsed;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :实例堆非内存
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例堆非内存")
-public class IcsInstanceMemoryNonHeap {
+public class IcsInstanceMemoryNonHeap implements Serializable {
 
+    private static final long serialVersionUID = 5457399972284816473L;
     @ApiModelProperty("非堆内存元空间")
     private double nonHeapMemoryMetaspace;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 实例线程信息
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例线程信息")
-public class IcsInstanceThread {
+public class IcsInstanceThread implements Serializable {
 
+    private static final long serialVersionUID = -272358532317411617L;
     @ApiModelProperty("实时线程")
     private double threadLive;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,8 +16,9 @@ import java.util.List;
  **/
 @Data
 @ApiModel("注册中心")
-public class IcsRegist {
+public class IcsRegist  implements Serializable {
 
+    private static final long serialVersionUID = -5624347440991960286L;
     @ApiModelProperty("环境")
     private String environment;
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -15,25 +17,27 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("指令操作")
-public class LacCommandOperate {
+public class LacCommandOperate implements Serializable {
 
-    @ApiParam(value ="指令集记录id" , example = "-1")
+    private static final long serialVersionUID = 2877359322522442241L;
+    @ApiParam(value = "指令集记录id", example = "-1")
     private Long operateObjId;
 
-    @ApiParam(value ="操作对象类型" , example = "-1")
+    @ApiParam(value = "操作对象类型", example = "-1")
     @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class)
     private Integer operateObjType;
 
-    @ApiParam(value ="操作" , example = "-1")
+    @ApiParam(value = "操作", example = "-1")
     @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class)
     private Integer operateCommand;
 
-    public LacCommandOperate(){}
+    public LacCommandOperate() {
+    }
 
-    public LacCommandOperate(Long operateObjId,Integer operate){
+    public LacCommandOperate(Long operateObjId, Integer operate) {
         this.operateObjId = operateObjId;
         LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate);
-        if(operate_command!=null) {
+        if (operate_command != null) {
             this.operateCommand = operate_command.getValue();
             this.operateObjType = operate_command.getOperateObjType().getValue();
         }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java

@@ -52,6 +52,7 @@ import java.util.List;
 @Api(value="指令集步骤",description = "指令集步骤")
 public class LacCommandStackStep extends BaseBean {
 
+    private static final long serialVersionUID = 4053765920069631323L;
     @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java

@@ -55,6 +55,7 @@ import javax.persistence.Transient;
 @Api(value="步骤任务",description = "步骤任务信息")
 public class LacCommandStackStepTask extends BaseBean {
 
+    private static final long serialVersionUID = 7432247591995852126L;
     @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java

@@ -49,6 +49,7 @@ import java.util.List;
 @Api(value="指令集模板",description = "指令集模板信息")
 public class LacCommandStackTemplate extends BaseBean {
 
+    private static final long serialVersionUID = 4884527553767334910L;
     @Column(name="TEMPLATE_NAME")
     @ApiParam(value ="模板名称")
     private String templateName;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java

@@ -24,21 +24,22 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="LAC_COMMAND_STACK_TYPE")
-@Api(value="指令集类型",description = "指令集类型")
+@Table(name = "LAC_COMMAND_STACK_TYPE")
+@Api(value = "指令集类型", description = "指令集类型")
 public class LacCommandStackType extends BaseBean {
 
 
-    @Column(name="TYPE_NAME")
-    @ApiParam(value ="类型名称")
+    private static final long serialVersionUID = -2699452452325728351L;
+    @Column(name = "TYPE_NAME")
+    @ApiParam(value = "类型名称")
     private String typeName;
 
-    @Column(name="TYPE_REF_NUM")
-    @ApiParam(value ="适配器使用数量")
+    @Column(name = "TYPE_REF_NUM")
+    @ApiParam(value = "适配器使用数量")
     private Integer typeRefNum;
 
-    @Column(name="TYPE_DESCRIPTION")
-    @ApiParam(value ="类型描述")
+    @Column(name = "TYPE_DESCRIPTION")
+    @ApiParam(value = "类型描述")
     private String typeDescription;
 
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java

@@ -57,17 +57,18 @@ import javax.persistence.Table;
 @Api(value="适配器",description = "适配器信息")
 public class LacSuitCase extends BaseBean {
 
-    @Column(name="SUTI_CASE_NAME_RDD")
+    private static final long serialVersionUID = 6325924633917664579L;
+    @Column(name="SUIT_CASE_NAME_RDD")
     @ApiParam(value ="适配器名称")
-    private String sutiCaseNameRdd;
+    private String suitCaseNameRdd;
 
     @Column(name="SUIT_CASE_CODE_RDD")
     @ApiParam(value ="适配器代码")
     private String suitCaseCodeRdd;
 
-    @Column(name="SUTI_TYPE")
+    @Column(name="SUIT_TYPE")
     @ApiParam(value ="适配器类型")
-    private Integer sutiType;
+    private Integer suitType;
 
     @Column(name="HARDWARE_TYPE")
     @ApiParam(value ="硬件类型")

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java

@@ -61,6 +61,7 @@ import java.util.List;
 @Api(value="调度任务",description = "调度任务信息")
 public class LacSuitTask extends BaseBean {
 
+    private static final long serialVersionUID = -6592851798133225109L;
     @Column(name="TASK_NAME")
     @ApiParam(value ="适配器名称")
     private String taskName;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java

@@ -54,6 +54,7 @@ import javax.persistence.Transient;
 @Api(value="调度任务参数",description = "调度任务参数信息")
 public class LacSuitTaskParam extends BaseBean {
 
+    private static final long serialVersionUID = 3521650869017242460L;
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java

@@ -55,6 +55,7 @@ import javax.persistence.Table;
 @Api(value="调度任务参数转换",description = "调度任务参数转换信息")
 public class LacSuitTaskParamAdapter extends BaseBean {
 
+    private static final long serialVersionUID = -4049358225863293288L;
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java

@@ -33,6 +33,7 @@ import javax.persistence.Transient;
 @Api(value="任务检查",description = "任务检查")
 public class LacTaskCheck extends BaseBean {
 
+    private static final long serialVersionUID = -4157772560831884634L;
     @Column(name="COMMAND_STACK_TEMPLATE_ID")
     @ApiParam(value ="指令集模板ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="任务类型",description = "任务类型")
 public class LacTaskType extends BaseBean {
 
+    private static final long serialVersionUID = 7596608775083338503L;
     @Column(name="TYPE_NAME")
     @ApiParam(value ="类型名称")
     private String typeName;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -65,6 +65,7 @@ public class LacHqlPack {
 
         DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -165,6 +166,8 @@ public class LacHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getCommandStackId(), "commandStackId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCommandStackNameRdd(), "commandStackNameRdd", ddlPackBean);
         DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
 
 
@@ -199,9 +202,9 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
 
-        DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSuitType(),"suitType",ddlPackBean);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.platbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -49,9 +48,9 @@ public class SysLogConsole extends BaseBean {
     @ApiParam(value ="应用端口")
     private Integer logPort;
 
-    @Column(name="LOG_GORP")
+    @Column(name="LOG_GROUP")
     @ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)")
-    private String logGorp;
+    private String logGroup;
 
     @Column(name="LOG_LEVEL")
     @ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -67,6 +67,19 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * In 参数封装
+     * @param columnName
+     * @return
+     */
+    public static DdlPackBean packHqlIn(String columnName, List params){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean);
+        DdlPreparedPack.getInPack(params, columnName, ddlPackBean);
+        return ddlPackBean;
+    }
+
 
     /**
      * 资源查询

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api(value = "数据源管理", description = "数据源管理")
 public class BsDataSource extends BaseBean {
 
+    private static final long serialVersionUID = 2763423692635373368L;
     @Column(name = "DATA_SOURCE_NAME")
     @ApiParam(value = "数据源名称")
     private String dataSourceName;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "MQ管理", description = "MQ管理")
 public class BsMessageQueue extends BaseBean {
 
+    private static final long serialVersionUID = -1130706382023544729L;
     @Column(name = "MESSAGE_QUEUE_NAME")
     @ApiParam(value = "消息队列名称")
     private String messageQueueName;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "数据适配转换", description = "数据适配转换")
 public class BsParamAdapter extends BaseBean {
 
+    private static final long serialVersionUID = -6238745304002006776L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java

@@ -7,11 +7,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.List;
 
 /**
  * @Description : socket套件
@@ -29,6 +28,7 @@ import java.util.List;
 @Api(value = "socket套件", description = "socket套件")
 public class BsSocketSuitCase extends BaseBean {
 
+    private static final long serialVersionUID = -1491505137380808987L;
     @Column(name = "SOCKET_TYPE_ID")
     @ApiParam(value = "socket类型（枚举）")
     private Integer socketTypeId;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java

@@ -31,6 +31,7 @@ import java.util.List;
 @Api(value = "适配认证", description = "适配认证")
 public class BsSslKey extends BaseBean {
 
+    private static final long serialVersionUID = 3934205467948800784L;
     @Column(name = "KEY_NAME")
     @ApiParam(value = "证书名称")
     private String keyName;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @XStreamAlias("BsSslKeyParam")
 public class BsSslKeyParam extends BaseBean {
 
+    private static final long serialVersionUID = 3521715129533450992L;
     @Column(name = "SSL_KEY_ID")
     @ApiParam(value = "证书id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value = "适配套件", description = "适配套件")
 public class BsSuitCase extends BaseBean {
 
+    private static final long serialVersionUID = -281224716754866835L;
     @Column(name = "SUIT_CASE_NAME")
     @ApiParam(value = "套件名称")
     private String suitCaseName;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java

@@ -31,6 +31,7 @@ import java.util.List;
 @Api(value = "数据库套件", description = "数据库套件")
 public class BsSuitCaseDataSource extends BaseBean {
 
+    private static final long serialVersionUID = 5519482989293937465L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "数据库表操作", description = "数据库表操作")
 public class BsSuitCaseDataSourceTable extends BaseBean {
 
+    private static final long serialVersionUID = 3674958775373712985L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value = "FTP适配器", description = "FTP适配器")
 public class BsSuitCaseFTP extends BaseBean {
 
+    private static final long serialVersionUID = 6174265510888236886L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value = "MQ", description = "MQ 适配套件")
 public class BsSuitCaseMq extends BaseBean {
 
+    private static final long serialVersionUID = 4562973480210332977L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java

@@ -38,6 +38,7 @@ import java.util.List;
 @Api(value = "适配器出入参", description = "适配器出入参")
 public class BsSuitCaseParam extends BaseBean {
 
+    private static final long serialVersionUID = -2186546861255097857L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java

@@ -34,6 +34,7 @@ import java.util.List;
 @Api(value = "适配器出入参", description = "适配器出入参")
 public class BsSuitCaseREST extends BaseBean {
 
+    private static final long serialVersionUID = 3871469059124604719L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value = "WebService", description = "WebService 适配套件")
 public class BsSuitCaseWebService extends BaseBean {
 
+    private static final long serialVersionUID = -5473608817496699798L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java

@@ -34,6 +34,7 @@ import java.util.List;
 @Api(value = "适配报文详情", description = "适配报文详情")
 public class BsSuitDataDetail extends BaseBean {
 
+    private static final long serialVersionUID = 4086839854444963656L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配套件id")
     private String suitCaseId;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "适配文件信息", description = "适配文件信息")
 public class BsSuitFile extends BaseBean {
 
+    private static final long serialVersionUID = -5476684791619434327L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -36,6 +36,7 @@ import java.util.List;
 @Api(value = "适配记录", description = "适配记录")
 public class BsSuitRecord extends BaseBean {
 
+    private static final long serialVersionUID = 174969165955420968L;
     @Column(name = "SUIT_CASE_NAME_RDD")
     @ApiParam(value = "适配套件名称")
     private String suitCaseNameRdd;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java

@@ -28,6 +28,7 @@ import javax.persistence.*;
 @Api(value = "适配记录参数", description = "适配记录参数")
 public class BsSuitRecordParam extends BaseBean {
 
+    private static final long serialVersionUID = -5521394058203638651L;
     @Column(name = "SUIT_RECORD_ID")
     @ApiParam(value = "适配记录id")
     private Long suitRecordId;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java

@@ -30,6 +30,7 @@ import javax.persistence.*;
 @Api(value = "请求适配记录", description = "请求适配记录")
 public class BsSuitRequestRecord extends BaseBean {
 
+    private static final long serialVersionUID = -6724051278362565068L;
     @Column(name = "SUIT_RECORD_ID")
     @ApiParam(value = "适配记录id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value = "定时适配任务", description = "定时适配任务")
 public class BsSuitSchedule extends BaseBean {
 
+    private static final long serialVersionUID = 4814615639892051613L;
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配套件id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api(value = "适配类型", description = "适配类型")
 public class BsSuitType extends BaseBean {
 
+    private static final long serialVersionUID = 5149466646176647559L;
     @Column(name = "SUIT_TYPE_NAME")
     @ApiParam(value = "适配类型")
     private String suitTypeName;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="测试数据 DataBase",description = "数据库操作测试")
 public class TestDataBase extends BaseBean {
 
+    private static final long serialVersionUID = -5334113633173923482L;
     @Column(name="NAME")
     @ApiParam(value ="名称" )
     private String name;