Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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避免精度丢失
@@ -141,6 +143,14 @@ public abstract class BaseBean implements Serializable {
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
+    public int getIsValidVal() {
+        return this.isValid == null ? 0 : this.isValid.intValue();
+    }
+
+    public int getIsDeletedVal() {
+        return this.isDeleted == null ? 0 : this.isDeleted.intValue();
+    }
+
     //排序方式
     public String orderBy(){
         String result = "";

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

@@ -67,6 +67,22 @@ public class DdlPackBean {
         return result;
     }
 
+    /**
+     * 查询指定组织、指定是否有效的数据
+     * @param organizeCode
+     * @param isValid
+     * @return
+     */
+    public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(isValid,"isValid",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
     public static DdlPackBean getDdlPackBean(){
         DdlPackBean result = new DdlPackBean();
 

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", "微服务"),
@@ -2212,6 +2214,16 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
         public static FIELD_TYPE codeOf(Integer value) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == value) {
@@ -2325,7 +2337,7 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static Integer valueOfDescription(String desc) {
+        public static Integer descriptionOfValue(String desc) {
             Integer tmp = 1;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].description.equals(desc)) {
@@ -2391,7 +2403,7 @@ public class CommonEnumUtil {
         }
 
 
-        public static Integer valueOfDescription(String desc) {
+        public static Integer descriptionOfValue(String desc) {
             Integer tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].description.equals(desc)) {

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

@@ -20,8 +20,7 @@ public class ImppEnumUtil {
 
         TYPE_GROUP(1, "集团", "集团"),
         TYPE_COMPANY(2, "公司", "公司"),
-        TYPE_FACTORY(3,"工厂","工厂"),
-        ;
+        TYPE_FACTORY(3, "工厂", "工厂");
 
         private int value;
         private String name;
@@ -829,6 +828,7 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 系统值类型
      * 1. String
@@ -1054,6 +1054,7 @@ public class ImppEnumUtil {
         }
     }
 
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_RECEIVER_TYPE {
         INTERNAL(1, "内部人员"),

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

@@ -538,6 +538,14 @@ public class WmsEnumUtil {
             return code;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -873,7 +881,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -1085,6 +1093,10 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -1250,6 +1262,9 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -2816,7 +2831,7 @@ public class WmsEnumUtil {
         // 根据枚举编号获取语言代码
         public static String getCodeByIndex(Integer index) {
             for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
-                if (languageType.getValue() == index.intValue()) {
+                if (languageType.getValue() == index) {
                     return languageType.getDescription();
                 }
             }
@@ -3283,7 +3298,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3325,6 +3340,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+
+        public static String descriptionOfValue(String desc) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -3355,7 +3381,7 @@ public class WmsEnumUtil {
     }
 
     public static Map<String, Object> getEnumByName(String enumName) throws Exception {
-        Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+        Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
         Class<Enum> clazz;
         Enum[] enumConstants;
 
@@ -3453,7 +3479,7 @@ public class WmsEnumUtil {
         public static String getDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == code) {
+                if (values()[i].value.equals(code)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3576,8 +3602,7 @@ public class WmsEnumUtil {
     public enum WMS_STOCK_TYPE {
         SOURCE(10, "实物条码"),
         TARGET(20, "虚拟条码"),
-        CUST_SN(30, "客户条码"),
-        FIRST_MIDDLE_LAST(40, "首中末件");
+        CUST_SN(30, "客户条码");
 
         private int value;
         private String description;
@@ -3702,7 +3727,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3742,7 +3767,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3876,7 +3901,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -4802,6 +4827,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
@@ -6575,4 +6611,299 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 运输方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRANSPORT_TYPE {
+        LONG_HAUL(10, "长途运输"),
+        SHORT_DISTANCE(20, "短途运输");
+
+        private int value;
+        private String description;
+
+        TRANSPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TRANSPORT_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 物流供应商类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOGISTICS_PROVIDER_TYPE {
+        VENDOR(10, "承运商");
+
+        private int value;
+        private String description;
+
+        LOGISTICS_PROVIDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static LOGISTICS_PROVIDER_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * BatchHold 物料检测标准值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_PART_CHECK_STD {
+        NUMBER(1, "NORMAL", "合格"),
+        TEXT(2, "ABNORMAL", "不合格");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_PART_CHECK_STD(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+
+    /**
+     * BH检测结果类型 RepairOrPick
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_TYPE {
+        PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+
+    /**
+     * BH检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_STATUS {
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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;
 

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,8 +17,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("指令操作")
-public class LacCommandOperate {
+public class LacCommandOperate implements Serializable {
 
+    private static final long serialVersionUID = 2877359322522442241L;
     @ApiParam(value = "指令集记录id", example = "-1")
     private Long operateObjId;
 
@@ -28,7 +31,8 @@ public class LacCommandOperate {
     @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class)
     private Integer operateCommand;
 
-    public LacCommandOperate(){}
+    public LacCommandOperate() {
+    }
 
     public LacCommandOperate(Long operateObjId, Integer operate) {
         this.operateObjId = operateObjId;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 public class LacCommandStackType extends BaseBean {
 
 
+    private static final long serialVersionUID = -2699452452325728351L;
     @Column(name = "TYPE_NAME")
     @ApiParam(value = "类型名称")
     private String typeName;

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-mdm/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-mdm</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description : MDM基础bean
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 17:30
+ * @Modify:
+ **/
+@Data
+@ApiModel("MDM基础bean")
+public class BaseMdmBean extends BaseBean {
+
+    private static final long serialVersionUID = 3957595289035947441L;
+
+    @Transient
+    @ApiModelProperty("是否主数据")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    public static Integer isMdmMaster  = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
+    @ApiModelProperty("mdm数据版本")
+    private Long mdmVersion;
+
+    public long getMdmVersion() {
+        return mdmVersion == null ? 0 : mdmVersion;
+    }
+
+    // 版本递增
+    public long nextMdmVersion() {
+        return mdmVersion = getMdmVersion() + 1;
+    }
+
+    @ApiModelProperty("是否发布")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isPublished;
+
+}

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description : MDM业务基础bean
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 17:30
+ * @Modify:
+ **/
+@Data
+@ApiModel("MDM业务基础bean")
+public class BaseMdmExtdBean extends BaseMdmBean {
+
+    private static final long serialVersionUID = 4267453020130810967L;
+
+    @Transient
+    @ApiModelProperty("软件模块")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    public static Integer mdmSoftType;
+
+
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mdm.bean.busi.core;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 主数据齿轮-平台扩展
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 18:09
+ * @Modify:
+ **/
+@Data
+@ApiModel("主数据齿轮-平台扩展")
+public class MdmGearCoreExtd extends BaseMdmExtdBean {
+
+    private static final long serialVersionUID = -3535174942277452194L;
+
+    // 初始化数据
+    static {
+        isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+        mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
+    }
+
+    @ApiModelProperty("核心数量")
+    public String coreNum;
+
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mdm.bean.master;
+
+import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 主数据齿轮
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 18:09
+ * @Modify:
+ **/
+@Data
+@ApiModel("主数据齿轮")
+public class MdmGear extends BaseMdmBean {
+
+    private static final long serialVersionUID = -7580444601811207793L;
+
+    @ApiModelProperty("齿轮名称")
+    private String name;
+
+    @ApiModelProperty("齿轮规格")
+    private String gearModel;
+
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mdm.bean.model.core;
+
+import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd;
+import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
+
+/**
+ * @Description : 主数据齿轮-平台model
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 18:09
+ * @Modify:
+ **/
+public class MdmGearCoreModel {
+
+    private MdmGear mdmGear;
+
+    private MdmGearCoreExtd mdmGearCoreExtd;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2706,7 +2706,12 @@ public class MesHqlPack {
     }
 
     public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPackBean packBean;
+        if(dataAuth.getIsValidVal() == 0) {
+            packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        } else {
+            packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
+        }
         if (!StringUtils.isEmpty(dataAuth.getDataObject())) {
             DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean);
         }

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:
- *  动态 Table 单元格
+ * @Modify: 动态 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:
- *      动态Table Row
+ * @Modify: 动态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:
- *      动态Table Row
+ * @Modify: 动态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 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)

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/mes/ExcelImportModel.java

@@ -21,6 +21,7 @@ import java.util.List;
 @Api("mes导入结果model")
 public class ExcelImportModel<T> implements Serializable {
 
+    private static final long serialVersionUID = 3075276018074690913L;
     @ApiParam("结果")
     private boolean result;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java

@@ -20,6 +20,7 @@ import java.io.Serializable;
 @Api("mes导入异常结果model")
 public class ImportErrorModel implements Serializable {
 
+    private static final long serialVersionUID = 1212013821950324792L;
     @ApiParam("错误的行号")
     private int rowNum;
 

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;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 @Api("导入结果model")
 public class ExcelImportModel implements Serializable {
 
+    private static final long serialVersionUID = 1444427447244864339L;
     @ApiParam("结果")
     private boolean result;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 @Data
 public class WmsCSOrderDetailsModel implements Serializable {
 
+    private static final long serialVersionUID = 1035157716685531017L;
     @ApiParam("工厂代码")
     public String  organizeCode;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Api("WMS列表菜单model")
 public class WmsListElementModel extends BaseBean {
 
+    private static final long serialVersionUID = -4040701771244617270L;
     @ApiParam(value = "功能菜单ID")
     private Long functionId;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Api("WMS列表搜索model")
 public class WmsSearchElementModel extends BaseBean {
 
+    private static final long serialVersionUID = -5429148439603308698L;
     @ApiParam(value = "功能菜单ID")
     private Long functionId;
 

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)