Merge branch 'dev' into test

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
 import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
@@ -17,6 +18,19 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class AndonHqlPack {
     /**
+     * genju 安灯队列参数查询安灯队列
+     * @param andonManageQueue
+     * @return
+     */
+    public static DdlPackBean getAndonQueuePack(AndonManageQueue andonManageQueue, String statusCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(statusCode, "statusCode", packBean);
+        return packBean;
+    }
+    /**
      * 封装公用查询参数
      *
      * @param bean   实体对象

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

@@ -97,25 +97,25 @@ public abstract class BaseBean implements Serializable {
     public String modifyDatetime;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String createDateTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     public String createDateTimeEnd;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String modifyDateTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     public String modifyDateTimeEnd;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java

@@ -1,5 +1,16 @@
 package cn.estsh.i3plus.pojo.base.codemaker;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sun.management.VMManagement;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+
 /**
  * @Description : 使用SnowFlake，生成分布式ID
  * @Reference : SnowFlake可以保证：
@@ -11,13 +22,15 @@ package cn.estsh.i3plus.pojo.base.codemaker;
  **/
 public class SnowflakeIdMaker {
 
+    public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class);
+
     private long workerId;
     private long datacenterId;
     private long sequence = 0L;
 
     public SnowflakeIdMaker(){
-        this.workerId = 1;
-        this.datacenterId = 1;
+        this.workerId = getWorkerMacId();
+        this.datacenterId = getDatacenterPid();
         this.sequence = 0L;
     }
 
@@ -89,6 +102,60 @@ public class SnowflakeIdMaker {
         return timestamp;
     }
 
+    /**
+     * 使用本机Mac 地址的HashCode 取摸 32
+     * @return
+     */
+    private long getWorkerMacId() {
+        long result;
+        try {
+            InetAddress ia;
+            byte[] mac = null;
+            //获取本地IP对象
+            ia = InetAddress.getLocalHost();
+            //获得网络接口对象（即网卡），并得到mac地址，mac地址存在于一个byte数组中。
+            mac = NetworkInterface.getByInetAddress(ia).getHardwareAddress();
+            //下面代码是把mac地址拼装成String
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i < mac.length; i++) {
+                if (i != 0) {
+                    sb.append("-");
+                }
+                //mac[i] & 0xFF 是为了把byte转化为正整数
+                String s = Integer.toHexString(mac[i] & 0xFF);
+                sb.append(s.length() == 1 ? 0 + s : s);
+            }
+
+            //把字符串所有小写字母改为大写成为正规的mac地址并返回
+            result = sb.toString().toUpperCase().hashCode();
+        }catch (Exception e){
+            e.printStackTrace();
+            result = 31;
+            LOGGER.error("[SnowflakeIdMaker] 获取设备ID错误：{}",e.getMessage());
+        }
+
+        result = result + timeGen();
+        return result < 0 ? (0 - result) % 32 : result % 32;
+    }
+
+    private long getDatacenterPid() {
+        long result;
+        try {
+            RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
+            Field jvm = runtime.getClass().getDeclaredField("jvm");
+            jvm.setAccessible(true);
+            VMManagement mgmt = (VMManagement) jvm.get(runtime);
+            Method pidMethod = mgmt.getClass().getDeclaredMethod("getProcessId");
+            pidMethod.setAccessible(true);
+            result = (Integer) pidMethod.invoke(mgmt);
+        } catch (Exception e) {
+            result = 31;
+        }
+
+        result = result + timeGen();
+        return result < 0 ? (0 - result) % 32 : result % 32;
+    }
+
     private long timeGen(){
         return System.currentTimeMillis();
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -60,6 +60,7 @@ public class XStreamFactory {
             }
         });
 
+        xStream.setMode(XStream.NO_REFERENCES);
         xStream.autodetectAnnotations(true);
 
         return xStream;

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

@@ -833,7 +833,7 @@ public class BlockFormEnumUtil {
         TEXT(200, "TEXT", "文本"),
         NUMBER(210, "NUMBER", "数字"),
         PASSWORD(230, "PASSWORD", "密码"),
-        DATE_TIME(300, "DATE", "日期"),
+        DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
 //        DATE(300, "DATE", "日期(yyyy-MM-dd)"),
 //        DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
         //        ELEMENT(700, "DICT_SELECT", "元素"),
@@ -847,10 +847,22 @@ public class BlockFormEnumUtil {
         private String code;
         private String description;
 
-        private PROPERTY_CONTROL_TYPE(int value, String code, String description) {
+        /**
+         * 默认查询关系
+         */
+        private SQL_WHERE defaultWhere;
+
+        PROPERTY_CONTROL_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
             this.value = value;
             this.code = code;
             this.description = description;
+            this.defaultWhere = defaultWhere;
         }
 
         public int getValue() {
@@ -865,6 +877,10 @@ public class BlockFormEnumUtil {
             return description;
         }
 
+        public SQL_WHERE getDefaultWhere() {
+            return defaultWhere;
+        }
+
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2476,7 +2492,6 @@ public class BlockFormEnumUtil {
         }
 
         public static SQL_WHERE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];

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

@@ -1030,6 +1030,57 @@ public class CommonEnumUtil {
         }
     }
 
+    /**
+     * 变量类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum  BASIS_TYPE {
+        INT(1, "int"),
+        DOUBLE(2, "double"),
+        LONG(3, "long"),
+        FLOAT(4, "float"),
+        CHAR(5, "char"),
+        BOOLEAN(6,"boolean"),
+        BYTE(7, "byte"),
+        SHORT(8, "short");
+
+        private int value;
+        private String description;
+
+        private BASIS_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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 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 final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();

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

@@ -752,6 +752,42 @@ public class MesEnumUtil {
     }
 
     /**
+     * 系统配置表枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CONFIG_TYPE {
+
+        FASTDFS_SAVE_PATH(10, "savePath");
+
+
+        private int value;
+        private String description;
+
+        CONFIG_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 事件类型枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 /**
  * @Description : 软适配 枚举接口
  * @Reference :
@@ -8,4 +10,76 @@ package cn.estsh.i3plus.pojo.base.enumutil;
  * @Modify:
  **/
 public class SoftSwitchEnumUtil {
+
+    /**
+     * 套件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CASE_TYPE{
+        SOCKET(1,"SOCKET"),
+        RESTFUL(2,"RESTFUL"),
+        DATASOURCE(3,"数据源");
+
+        private int value;
+        private String description;
+
+        CASE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 请求来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REQUEST_SOURCE{
+        ACTIVE(1,"主动请求"),
+        SCHEDULE(2,"定时调度");
+
+        private int value;
+        private String description;
+
+        REQUEST_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -3189,4 +3189,57 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 盘点差异类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum INVENTORY_DIFFERENCE_TYPE {
+        INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
+        INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
+        INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢");
+
+        private int value;
+        private String code;
+        private String description;
+
+        INVENTORY_DIFFERENCE_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 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;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -150,7 +150,12 @@ public class DdlPreparedPack {
                 } else {
                     order[i] = "desc";
                 }
-                sqlStr += " model." + columnName[i] + " " + order[i].toString() + ",";
+                if(columnName[i].indexOf(" model.") == -1){
+                    sqlStr += " model." + columnName[i];
+                }else{
+                    sqlStr += columnName[i];
+                }
+                sqlStr += " " + order[i].toString() + ",";
             }
         }
 
@@ -506,4 +511,24 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }
+
+    /**
+     * 转换排序列
+     * @param columnName 列名
+     * @param basisType 基本类型
+     * @see CommonEnumUtil.BASIS_TYPE
+     * @return
+     */
+    public static String getOrderColConvertType(String columnName,int basisType){
+        String name =" model." + columnName;
+
+        if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
+            name = " cast(" + name+ " as integer)";
+        } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){
+            name = " cast(" + name+ " as double)";
+        } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){
+            name = " cast(" + name+ " as long)";
+        }
+        return name;
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java

@@ -62,4 +62,28 @@ public class MesESOP extends BaseBean {
     @Column(name="SOP_URL")
     @ApiParam("SOP_URL")
       private String sopUrl;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("GROUP_NAME")
+    private String groupName;
+
+    @Column(name="FILE_ORIGIN_NAME")
+    @ApiParam("FILE_ORIGIN_NAME")
+    private String fileOriginName;
+
+    @Column(name="FILE_SIZE")
+    @ApiParam("FILE_SIZE")
+    private String fileSize;
+
+    @Column(name="FILE_TYPE_ID")
+    @ApiParam("FILE_TYPE_ID")
+    private String fileTypeId;
+
+    @Column(name="FILE_TYPE_NAME")
+    @ApiParam("FILE_TYPE_NAME")
+    private String fileTypeName;
+
+    @Column(name="SYNC_TAG")
+    @ApiParam("SYNC_TAG")
+    private Integer syncTag=0;
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 打印模板
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="Mes_LABEL_TEMPLATE")
+@Api(value="打印模板",description = "打印模板")
+public class MesLabelTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 5371856566557305323L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_NAME")
+    @ApiParam(value ="模板名称")
+    private String templateName;
+
+    @Lob
+    @Column(name="TEMPLATE_CONTENT")
+    @ApiParam(value ="模板内容")
+    private String templateContent;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数拼接")
+    @Transient
+    private String paramsPack;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 打印模板参数
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="Mes_LABEL_TEMPLATE_PARAM")
+@Api(value="打印模板参数",description = "打印模板参数")
+public class MesLabelTemplateParam extends BaseBean {
+
+    private static final long serialVersionUID = 6476163540527157643L;
+    @Column(name="TEMPLATE_ID")
+    @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long templateId;
+
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_PARAM")
+    @ApiParam(value ="模板参数")
+    private String templateParam;
+
+    @Lob
+    @Column(name="TEMPLATE_PARAM_TEXT")
+    @ApiParam(value ="模板参数描述")
+    private String templateParamText;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数值")
+    @Transient
+    private String templateParamValue;
+}

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/19 7:00 PM
+ * @Description:
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("FastDfs文件model")
+public class FastDfsDownloadModel {
+
+    @ApiParam("部分相对路径")
+    private String dirPath;
+
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @ApiParam("文件字节")
+    private byte[] fileByte;
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesLabelTemplateParamRepository extends BaseRepository<MesLabelTemplateParam, Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesLabelTemplateRepository extends BaseRepository<MesLabelTemplate, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java

@@ -70,12 +70,12 @@ public class MesBom extends BaseBean {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam(value = "生效时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam(value = "失效时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effEndTime;
 
     public double getQtyVal() {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java

@@ -23,27 +23,27 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_ESOP")
+@Table(name = "MES_ESOP")
 @Api("作业指导书信息表(ODS)")
 public class MesESOP extends BaseBean {
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name="WORK_CELL_CODE")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name="ROUTE_CODE")
+    @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;
 
-    @Column(name="PROCESS_CODE")
+    @Column(name = "PROCESS_CODE")
     @ApiParam("工序代码")
     private String processCode;
 
@@ -55,11 +55,32 @@ public class MesESOP extends BaseBean {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
-    @Column(name="SOP_NAME")
+    @Column(name = "SOP_NAME")
     @ApiParam("SOP名称")
     private String sopName;
 
-    @Column(name="SOP_URL")
+    @Column(name = "SOP_URL")
     @ApiParam("SOP_URL")
-      private String sopUrl;
+    private String sopUrl;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("GROUP_NAME")
+    private String groupName;
+
+    @Column(name="FILE_ORIGIN_NAME")
+    @ApiParam("FILE_ORIGIN_NAME")
+    private String fileOriginName;
+
+    @Column(name="FILE_SIZE")
+    @ApiParam("FILE_SIZE")
+    private String fileSize;
+
+    @Column(name="FILE_TYPE_ID")
+    @ApiParam("FILE_TYPE_ID")
+    private String fileTypeId;
+
+    @Column(name="FILE_TYPE_NAME")
+    @ApiParam("FILE_TYPE_NAME")
+    private String fileTypeName;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java

@@ -49,7 +49,7 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncFrequency;
 
     @Column(name="SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value ="同步时间")
     private String syncTime;
 
@@ -62,7 +62,7 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncType;
 
     @Column(name="LAST_SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java

@@ -94,24 +94,24 @@ public class MesPlanOrder extends BaseBean {
 
     /**********************  冗余字段 *********************************/
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;
 
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
+import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -191,6 +192,11 @@ public class MesWorkOrder extends BaseBean {
         return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
     }
 
+    @Transient
+    @ApiParam("mes生产工单页面按钮控制")
+    private MesWorkOrderButtonModel workOrderButtonModel;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/19 7:00 PM
+ * @Description:
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("FastDfs文件model")
+public class FastDfsDownloadModel {
+
+    @ApiParam("部分相对路径")
+    private String dirPath;
+
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @ApiParam("文件字节")
+    private byte[] fileByte;
+
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单页面按钮控制model")
+public class MesWorkOrderButtonModel implements Serializable {
+
+    @ApiParam("修改按钮")
+    private boolean updateButton;
+
+    @ApiParam("按配置修改按钮")
+    private boolean updateButton4Config;
+
+    @ApiParam("下达按钮")
+    private boolean transmitButton;
+
+    @ApiParam("测试动态下达按钮")
+    private boolean dynamicTransmitButton4Test;
+
+    @ApiParam("启动按钮")
+    private boolean startUpButton;
+
+    @ApiParam("暂停按钮")
+    private boolean suspendButton;
+
+    @ApiParam("撤销按钮")
+    private boolean revokeButton;
+
+    @ApiParam("关闭按钮")
+    private boolean closeButton;
+
+
+}

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

@@ -49,6 +49,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * 生产计划查询条件封装
      *
@@ -376,15 +377,16 @@ public class MesHqlPack {
 /******************created by wynne*************/
     /**
      * MES 报废信息查询
+     *
      * @param mesScrap
      * @return
      */
     public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){
+        if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) {
             DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesScrap.getScrapName())){
+        if (StringUtils.isNotEmpty(mesScrap.getScrapName())) {
             DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
         }
         if (mesScrap.getIsValid() != null) {
@@ -395,15 +397,16 @@ public class MesHqlPack {
 
     /**
      * MES PCN系统配置信息条件查询
+     *
      * @param mesConfig
      * @return
      */
     public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){
+        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
             DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesConfig.getCfgName())){
+        if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
             DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
         }
         if (mesConfig.getIsValid() != null) {
@@ -414,18 +417,19 @@ public class MesHqlPack {
 
     /**
      * MES 维修信息条件查询
+     *
      * @param mesRepair
      * @return
      */
     public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){
+        if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) {
             DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesRepair.getRepairName())){
+        if (StringUtils.isNotEmpty(mesRepair.getRepairName())) {
             DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
         }
-        if (mesRepair.getRepairType() != null){
+        if (mesRepair.getRepairType() != null) {
             DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
         }
         if (mesRepair.getIsValid() != null) {
@@ -474,26 +478,27 @@ public class MesHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getMesEventByButtonCode(String buttonCode,String org){
-        DdlPackBean packBean=getAllBaseData(org);
-        DdlPreparedPack.getStringEqualPack(buttonCode,"buttonCode",packBean);
-        DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean);
+    public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
-    public static DdlPackBean getMesEventByEventCode(String eventCode,String org){
-        DdlPackBean packBean=getAllBaseData(org);
-        DdlPreparedPack.getStringEqualPack(eventCode,"eventCode",packBean);
-        DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean);
+
+    public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
-    public static DdlPackBean getMesActionByActionCode(MesAction mesAction,String organizeCode){
-        DdlPackBean packBean=getAllBaseDataByNormalPro(mesAction,organizeCode);
-        DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(),"actionCode",packBean);
+
+    public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
         return packBean;
     }
 
 
-
     /**
      * 动作分页获取封装
      *
@@ -511,9 +516,8 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean);
         }
 
-        if (mesAction.getActionType() != null && StringUtils.isNotEmpty(mesAction.getActionType() + "")) {
-            DdlPreparedPack.getStringEqualPack(mesAction.getActionType() + "", "actionType", packBean);
-        }
+        DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean);
+
         return packBean;
     }
 
@@ -548,6 +552,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * 事件动作分页获取封装
      *

modules/i3plus-pojo-model/pom.xml

@@ -42,6 +42,10 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-form</artifactId>
         </dependency>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-softswitch</artifactId>
+        </dependency>
 
     </dependencies>
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java

@@ -1,10 +1,17 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import lombok.Data;
 
+import javax.persistence.Transient;
+
 /**
  * @Description :
  * @Reference :
@@ -16,27 +23,87 @@ import lombok.Data;
 @XStreamAlias("model")
 public class SuitCoreModel {
 
+    /**
+     * 适配套件代码
+     */
     @XStreamAsAttribute
-    private Long id;
+    private String suitCaseCode;// adapterId
+
+    /**
+     * 套件类型
+     */
     @XStreamAsAttribute
     private Integer caseType;
+
+    /**
+     * 适配结果信息
+     */
+    private String suitMessage;
+
+    /**
+     * 请求来源
+     */
+    private Integer requestSource;
+
     private String suitCaseStatusCode;
-    private String suitCaseMessage;
 
-    private String key;
-    private PojoAuth auth;
-    private Request request;
+    /**
+     * 安全证书
+     */
+    private BsSslKey sslKey;
+
+    /**
+     * 认证令牌
+     */
+    private String token;
 
+    /**
+     * 适配器套件
+     */
+    private BsSuitCase bsSuitCase;
+
+    /**
+     * 认证结果
+     */
+    private Integer suitSslKeyResult;
+
+    /**
+     * 认证信息
+     */
+    private String suitSslKeyResultMessage;
+
+    /**
+     * 适配结果
+     */
+    private Integer suitResult;
+
+    /**
+     * 适配报文
+     */
     @XStreamCDATA
-    private String responseResult;
-
-    public SuitCoreModel(Long id, Integer caseType, String suitCaseStatusCode, String key, PojoAuth auth, Request request) {
-        this.id = id;
-        this.caseType = caseType;
-        this.suitCaseStatusCode = suitCaseStatusCode;
-        this.key = key;
-        this.auth = auth;
-        this.request = request;
+    private String suitResultMessage;
+
+    /**
+     *
+     * @param requestSource 请求来源
+     * @param sslKey 安全证书对象
+     * @param bsSuitCase 适配器信息
+     */
+    public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) {
+        this.sslKey = sslKey;
+        this.bsSuitCase = bsSuitCase;
+        this.requestSource = requestSource;
+
+        // 设置套件类型
+        this.caseType = bsSuitCase.getCaseTypeId();
+        // 设置套件代码
+        this.suitCaseCode = bsSuitCase.getSuitCaseCode();
+        // 设置默认
+        this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+        // 设置默认
+        this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+        // 设置默认
+        this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
     }
 }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java

@@ -34,6 +34,10 @@ public class SysTask extends BaseBean {
     @ApiParam(value ="名称")
     private String name;
 
+    @Column(name="TASK_CODE")
+    @ApiParam(value ="任务代码")
+    private String taskCode;
+
     // 软件类型 CommonEnumUtil.SOFT_TYPE
     @Column(name="TASK_SOFT_TYPE")
     @ApiParam(value = "软件类型")
@@ -47,6 +51,10 @@ public class SysTask extends BaseBean {
     @ApiParam(value ="任务类名")
     private String taskClass;
 
+    @Column(name="IS_SYSTEM")
+    @ApiParam(value ="是否是系统job")
+    private String isSystem;
+
     @Column(name="TASK_DESCRIPTION")
     @ApiParam(value ="任务描述" , access ="任务描述")
     private String taskDescription;

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

@@ -31,9 +31,17 @@ public class BsDataSource extends BaseBean {
     @ApiParam(value = "数据源名称")
     private String dataSourceName;
 
+    @Column(name = "DATA_SOURCE_CODE")
+    @ApiParam(value = "数据源编码",access = "作为关系引用，在数据切换的时候会找不到ID 数据变了引用还在")
+    private String dataSourceCode;
+
+    @Column(name = "DATA_BASE_NAME")
+    @ApiParam(value = "数据库名称")
+    private String dataBaseName;
+
     @Column(name = "DATA_SOURCE_TYPE_ID")
     @ApiParam(value = "数据源类型id")
-    private int dataSourceTypeId;
+    private Integer dataSourceTypeId;
 
     @Column(name = "DATA_SOURCE_HOST")
     @ApiParam(value = "数据源主机")
@@ -41,7 +49,7 @@ public class BsDataSource extends BaseBean {
 
     @Column(name = "DATA_SOURCE_PORT")
     @ApiParam(value = "数据源端口")
-    private int dataSourcePort;
+    private Integer dataSourcePort;
 
     @Column(name = "DATA_SOURCE_USER")
     @ApiParam(value = "用户名")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -29,15 +31,16 @@ public class BsDataSourceSuitCase extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
-    private long suitCaseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
 
     @Column(name = "DATA_SOURCE_MODE_ID")
     @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）")
-    private int dataSourceModeId;
+    private Integer dataSourceModeId;
 
-    @Column(name = "DATA_SOURCE_ID")
-    @ApiParam(value = "数据源id")
-    private long dataSourceId;
+    @Column(name = "DATA_SOURCE_CODE")
+    @ApiParam(value = "数据源编码")
+    private String dataSourceCode;
 
     @Column(name = "DATA_SOURCE_NAME_RDD")
     @ApiParam(value = "数据源名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -29,7 +31,8 @@ public class BsDataSourceSuitCaseTable extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
-    private long suitCaseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
 
     @Column(name = "TABLE_NAME")
     @ApiParam(value = "数据库表名")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -33,7 +35,7 @@ public class BsMessageQueue extends BaseBean {
 
     @Column(name = "MESSAGE_QUEUE_TYPE")
     @ApiParam(value = "消息队列类型")
-    private int messageQueueType;
+    private Integer messageQueueType;
 
     @Column(name = "MESSAGE_QUEUE_HOST")
     @ApiParam(value = "消息队列主机")
@@ -41,11 +43,7 @@ public class BsMessageQueue extends BaseBean {
 
     @Column(name = "MESSAGE_QUEUE_PORT")
     @ApiParam(value = "消息队列端口")
-    private int messageQueuePort;
-
-    @Column(name = "CERTIFICATE_ID")
-    @ApiParam(value = "证书id")
-    private long certificateId;
+    private Integer messageQueuePort;
 
 }
 

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -29,11 +31,12 @@ public class BsParamAdapter extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配套件id")
-    private long suitCaseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
 
-    @Column(name = "SUIT_CASE_NAME")
+    @Column(name = "SUIT_CASE_NAME_RDD")
     @ApiParam(value = "适配套件名称")
-    private String suitCaseName;
+    private String suitCaseNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配套件代码")
@@ -41,11 +44,12 @@ public class BsParamAdapter extends BaseBean {
 
     @Column(name = "SUIT_PARAM_TYPE_ID")
     @ApiParam(value = "参数类型枚举")
-    private int suitParamTypeId;
+    private Integer suitParamTypeId;
 
     @Column(name = "SUIT_PARAM_ID")
     @ApiParam(value = "原参数id")
-    private long suitParamId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitParamId;
 
     @Column(name = "SUIT_PARAM_NAME_RDD")
     @ApiParam(value = "参数名称")
@@ -53,7 +57,7 @@ public class BsParamAdapter extends BaseBean {
 
     @Column(name = "SUIT_PARAM_VAL_TYPE_ID")
     @ApiParam(value = "原参数值类型")
-    private int suitParamValTypeId;
+    private Integer suitParamValTypeId;
 
     @Column(name = "TRANSFER_PARAM_NAME")
     @ApiParam(value = "转换参数名称")
@@ -61,7 +65,7 @@ public class BsParamAdapter extends BaseBean {
 
     @Column(name = "TRANSFER_PARAM_VAL_TYPE_ID")
     @ApiParam(value = "转换参数类型")
-    private int transferParamValTypeId;
+    private Integer transferParamValTypeId;
 
 }
 

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

@@ -29,11 +29,11 @@ public class BsSocketSuitCase extends BaseBean {
 
     @Column(name = "SOCKET_TYPE_ID")
     @ApiParam(value = "socket类型（枚举）")
-    private int socketTypeId;
+    private Integer socketTypeId;
 
     @Column(name = "SOCKET_MODE_ID")
     @ApiParam(value = "socket模式(枚举,服务端，客户端)")
-    private int socketModeId;
+    private Integer socketModeId;
 
 }
 

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.pojo.softswitch.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 com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -10,6 +13,8 @@ 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 : 安全证书
@@ -29,7 +34,7 @@ public class BsSslKey extends BaseBean {
 
     @Column(name = "VERIFICATION_METHOD_ID")
     @ApiParam(value = "认证方式(枚举)")
-    private int verificationMethodId;
+    private Integer verificationMethodId;
 
     @Column(name = "VERIFICATION_URL")
     @ApiParam(value = "认证url")
@@ -37,7 +42,7 @@ public class BsSslKey extends BaseBean {
 
     @Column(name = "KEY_TYPE")
     @ApiParam(value = "证书类型枚举")
-    private int keyType;
+    private Integer keyType;
 
     @Column(name = "KEY_NAME")
     @ApiParam(value = "证书名称")
@@ -45,7 +50,8 @@ public class BsSslKey extends BaseBean {
 
     @Column(name = "KEY_FILE_ID")
     @ApiParam(value = "证书文件id")
-    private long keyFileId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long keyFileId;
 
     @Column(name = "KEY_FILE_PATH")
     @ApiParam(value = "证书文件路径")
@@ -63,5 +69,9 @@ public class BsSslKey extends BaseBean {
     @ApiParam(value = "证书描述")
     private String keyDescription;
 
+    @Transient
+    @ApiParam(value = "证书参数集合")
+    private List<BsSslKeyParam> bsSslKeyParamList;
+
 }
 

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.softswitch.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 com.thoughtworks.xstream.annotations.XStreamAlias;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+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;
+
+/**
+ * @Description : 安全证书参数
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-08-13 9:21
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SSL_KEY_PARAM")
+@Api(value = "安全证书参数", description = "安全证书参数")
+@XStreamAlias("BsSslKeyParam")
+public class BsSslKeyParam extends BaseBean {
+
+    @Column(name = "SSL_KEY_ID")
+    @ApiParam(value = "证书id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sslKeyId;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam(value = "参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam(value = "参数值")
+    private String paramValue;
+
+}

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -10,6 +12,8 @@ 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 : 适配套件
@@ -27,17 +31,23 @@ import javax.persistence.Table;
 @Api(value = "适配套件", description = "适配套件")
 public class BsSuitCase extends BaseBean {
 
+    @Column(name = "SUIT_CASE_NAME")
+    @ApiParam(value = "套件名称")
+    private String suitCaseName;
+
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
-    private int caseTypeId;
+    private Integer caseTypeId;
 
     @Column(name = "CASE_DETAIL_ID")
     @ApiParam(value = "适配器明细id")
-    private long caseDetailId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long caseDetailId;
 
     @Column(name = "SUIT_TYPE_ID")
     @ApiParam(value = "适配类型id")
-    private long suitTypeId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitTypeId;
 
     @Column(name = "SUIT_TYPE_NAME")
     @ApiParam(value = "适配类型名称")
@@ -53,35 +63,43 @@ public class BsSuitCase extends BaseBean {
 
     @Column(name = "SUIT_CASE_PORT")
     @ApiParam(value = "适配端口")
-    private int suitCasePort;
+    private Integer suitCasePort;
+
+    @Column(name = "SUIT_CASE_URL")
+    @ApiParam(value = "适配URL")
+    private String suitCaseURL;
 
     @Column(name = "IS_NEED_CERTIFICATION")
     @ApiParam(value = "是否需要认证")
-    private int isNeedCertification;
+    private Integer isNeedCertification;
 
-    @Column(name = "CERTIFICATE_ID")
+    @Column(name = "SSL_KEY_ID")
     @ApiParam(value = "证书id")
-    private long certificateId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sslKeyId;
 
     @Column(name = "TIMING_SUIT_NUM")
     @ApiParam(value = "定时适配次数")
-    private int timingSuitNum;
+    private Integer timingSuitNum;
 
     @Column(name = "INITIATIVE_SUIT_NUM")
     @ApiParam(value = "主动适配测试")
-    private int initiativeSuitNum;
+    private Integer initiativeSuitNum;
 
     @Column(name = "SUCCESS_NUM")
     @ApiParam(value = "成功次数")
-    private int successNum;
+    private Integer successNum;
 
     @Column(name = "FAIL_NUM")
     @ApiParam(value = "失败次数")
-    private int failNum;
+    private Integer failNum;
 
     @Column(name = "SUIT_CASE_DESCRIPTION")
     @ApiParam(value = "适配类型描述")
     private String suitCaseDescription;
 
+    @Transient
+    @ApiParam(value = "适配器参数")
+    List<BsSuitCaseParam> bsSuitCaseParamList;
 }
 

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -10,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 适配器出入参
@@ -29,7 +32,8 @@ public class BsSuitCaseParam extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
-    private long suitCaseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
 
     @Column(name = "SUIT_CASE_CODE_RDD")
     @ApiParam(value = "套件代码")
@@ -37,7 +41,7 @@ public class BsSuitCaseParam extends BaseBean {
 
     @Column(name = "PARAM_TYPE_ID")
     @ApiParam(value = "参数类型，枚举(出,入)")
-    private int paramTypeId;
+    private Integer paramTypeId;
 
     @Column(name = "PARAM_NAME")
     @ApiParam(value = "参数名称)")
@@ -45,7 +49,7 @@ public class BsSuitCaseParam extends BaseBean {
 
     @Column(name = "PARAM_VAL_TYPE_ID")
     @ApiParam(value = "参数值类型")
-    private int paramValTypeId;
+    private Integer paramValTypeId;
 
     @Column(name = "PARAM_DEFAULT_VAL")
     @ApiParam(value = "参数默认值")
@@ -55,5 +59,9 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数描述")
     private String paramDescription;
 
+    @Transient
+    @ApiParam(value = "参数值")
+    private String paramValue;
+
 }
 

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -41,7 +43,8 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "SUIT_RECORD_ID")
     @ApiParam(value = "适配记录id")
-    private long suitRecordId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitRecordId;
 
     @Column(name = "GET_DATE_TIME")
     @ApiParam(value = "获取报文时间")
@@ -57,7 +60,7 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
-    private int processState;
+    private Integer processState;
 
     @Column(name = "PROCESS_TIME")
     @ApiParam(value = "处理时间")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -37,23 +39,30 @@ public class BsSuitRecord extends BaseBean {
 
     @Column(name = "SUIT_CASE_TYPE")
     @ApiParam(value = "适配套件类型id枚举")
-    private int suitCaseType;
+    private Integer suitCaseType;
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配器套件id")
-    private long suitCaseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "CASE_TYPE_ID")
+    @ApiParam(value = "套件类型id(枚举)")
+    private Integer caseTypeId;
 
     @Column(name = "SUIT_CASE_DETAIL_ID")
     @ApiParam(value = "适配套件明细id")
-    private long suitCaseDetailId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseDetailId;
 
     @Column(name = "SUIT_METHOD_ID")
     @ApiParam(value = "适配方式id枚举")
-    private int suitMethodId;
+    private Integer suitMethodId;
 
     @Column(name = "SUIT_TYPE_ID")
     @ApiParam(value = "适配类型id")
-    private long suitTypeId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitTypeId;
 
     @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
@@ -61,23 +70,36 @@ public class BsSuitRecord extends BaseBean {
 
     @Column(name = "REQUEST_SOURCE")
     @ApiParam(value = "请求来源(枚举)")
-    private int requestSource;
+    private Integer requestSource;
 
-    @Column(name = "SUIT_SSL_KEY_ID")
+    @Column(name = "SSL_KEY_ID")
     @ApiParam(value = "证书id")
-    private long suitSslKeyId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sslKeyId;
 
     @Column(name = "SUIT_SSL_KEY_NAME_RDD")
     @ApiParam(value = "证书名称")
     private String suitSslKeyNameRdd;
 
+    @Column(name = "SUIT_SSL_KEY_RESULT")
+    @ApiParam(value = "认证结果")
+    private String suitSslKeyResult;
+
+    @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE")
+    @ApiParam(value = "认证信息")
+    private String suitSslKeyResultMessage;
+
     @Column(name = "SUIT_RESULT")
     @ApiParam(value = "适配结果")
-    private int suitResult;
+    private Integer suitResult;
+
+    @Column(name = "SUIT_MESSAGE")
+    @ApiParam(value = "适配信息")
+    private String suitMessage;
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
-    private int processState;
+    private Integer processState;
 
     @Column(name = "PROCESS_TIME")
     @ApiParam(value = "处理时间")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
@@ -29,15 +31,17 @@ public class BsSuitRequestRecord extends BaseBean {
 
     @Column(name = "SUIT_RECORD_ID")
     @ApiParam(value = "适配记录id")
-    private long suitRecordId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitRecordId;
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配器套件id")
-    private long suitCaseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
 
     @Column(name = "REQUEST_SOURCE")
     @ApiParam(value = "请求来源(枚举)")
-    private int requestSource;
+    private Integer requestSource;
 
     @Column(name = "REQUEST_ORGIN_PARAM")
     @ApiParam(value = "请求原始参数")

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

@@ -1,12 +1,15 @@
 package cn.estsh.i3plus.pojo.softswitch.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;
 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;
@@ -29,15 +32,38 @@ public class BsSuitSchedule extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配套件id")
-    private long suitCaseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
 
     @Column(name = "SUIT_CASE_NAME_RDD")
     @ApiParam(value = "适配套件名称")
     private String suitCaseNameRdd;
 
-    @Column(name = "EXECUTE_CRON")
-    @ApiParam(value = "执行时间表达式")
-    private String executeCron;
+    @Column(name = "SCHEDULE_NAME")
+    @ApiParam(value = "任务名称")
+    private String scheduleName;
+
+    @Column(name = "SCHEDULE_GROUP_NAME")
+    @ApiParam(value = "任务组名称")
+    private String scheduleGroupName;
+
+    @Column(name = "TASK_PLAN_ID")
+    @ApiParam(value = "任务计划id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskPlanId;
+
+    @Column(name = "TASK_CYCLE_ID")
+    @ApiParam(value = "任务周期id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskCycleId;
+
+    @Column(name = "TASK_CYCLE_NAME_RDD")
+    @ApiParam(value = "任务周期名称")
+    private String taskCycleName;
+
+    @Column(name = "TASK_CYCLE_EXECUTE_RDD")
+    @ApiParam(value = "任务周期表达式表达式")
+    private String taskCycleExecuteRdd;
 
     @Column(name = "LAST_EXECUTE_DATE_TIME")
     @ApiParam(value = "最后一次执行时间")

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

@@ -33,7 +33,7 @@ public class BsSuitType extends BaseBean {
 
     @Column(name = "SUIT_CASE_NUM")
     @ApiParam(value = "适配器数量")
-    private int suitCaseNum;
+    private Integer suitCaseNum = 0;
 
 }
 

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

@@ -29,7 +29,7 @@ public class SuitRecordParam extends BaseBean {
 
     @Column(name = "SUIT_RECORD_ID")
     @ApiParam(value = "适配记录id")
-    private long suitRecordId;
+    private Long suitRecordId;
 
     @Column(name = "PARAM_NAME")
     @ApiParam(value = "参数名称")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -3,8 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
+import cn.estsh.i3plus.pojo.softswitch.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -76,4 +75,135 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 适配套件条件封装
+     * @param bsSuitCase 查询条件
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+//        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+//        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean);
+//        DdlPreparedPack.getNumEqualPack(bsSuitCase.getParamTypeId(), "paramTypeId", ddlPackBean);
+//        DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseId(), "suitCaseId", ddlPackBean);
+//        DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 适配套件唯一校验
+     * @param bsSuitCase 适配套件信息
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据适配转换规则查询条件封装
+     * @param bsParamAdapter 数据适配转换规则
+     * @return
+     */
+    public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsParamAdapter.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据适配装换规则唯一校验
+     * @param bsParamAdapter 数据适配转换规则
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamId(), "suitParamId", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 定时适配任务查询条件封装
+     * @param bsSuitSchedule 查询条件
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getTaskCycleId(),"taskCycleId",ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsSuitSchedule.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 定时适配任务唯一校验
+     * @param bsSuitSchedule
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 安全证书查询条件分页
+     * @param bsSslKey 查询条件
+     * @return
+     */
+    public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsSslKey.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 安全证书唯一校验
+     * @param bsSslKey
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="BAS_VENDOR")
-@Api("供应商")
+@Api("供应商信息")
 public class BasVendor extends BaseBean{
 
     private static final long serialVersionUID = 9214639813072592779L;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java

@@ -116,6 +116,13 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("源单位")
     public String srcUnit;
 
+    /**
+     * 差异类型：10：盘平，20：盘亏，30盘赢
+     */
+    @Transient
+    @ApiParam("差异类型")
+    public String differenceType;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 领料单模板
+* @Reference :
+* @author: amy.liu
+* @date: 2019/8/19 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="领料单模板",description = "领料单模板")
+public class WmsPickingMovement extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607620L;
+
+    @ApiParam(value = "领料单号")
+    @AnnoOutputColumn
+    private String orderNo;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "领料数量")
+    @AnnoOutputColumn
+    private Double qty;
+
+    @ApiParam(value = "源存储区")
+    @AnnoOutputColumn
+    private String srcZoneNo;
+
+    @ApiParam(value = "目标存储区")
+    @AnnoOutputColumn
+    private String destZoneNo;
+
+    @ApiParam(value = "目标库位")
+    @AnnoOutputColumn
+    private String destLocateNo;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String factory;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -124,7 +124,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
-
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getCreateUser(), "createUser", result);
         DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
                 wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
         getStringBuilderPack(wmsDocMovementDetails, result);
@@ -165,6 +165,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCreateUser(),"createUser",packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
@@ -172,6 +173,24 @@ public class WmsHqlPack {
     }
 
     /**
+     * 移库单号集合查询条件封装
+     * @param orderNoList
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList,String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
+
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+
+        return packBean;
+    }
+
+
+    /**
      * PO订单主表信息 分页查询
      *
      * @param wmsPOMaster
@@ -187,7 +206,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
-
+        DdlPreparedPack.getStringLikerPack(wmsPOMaster.getCreateUser(), "createUser", result);
+        DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),wmsPOMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
         getStringBuilderPack(wmsPOMaster, result);
 
         return result;
@@ -572,6 +592,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsASNMaster.getCreateUser(), "createUser", result);
+        DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),wmsASNMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
 
         getStringBuilderPack(wmsASNMaster, result);
 
@@ -602,6 +624,9 @@ public class WmsHqlPack {
         //单据来源
         DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
 
+        DdlPreparedPack.getStringLikerPack(wmsShipping.getCreateUser(), "createUser", result);
+        DdlPreparedPack.timeBuilder(wmsShipping.getCreateDateTimeStart(),wmsShipping.getCreateDateTimeEnd(),"createDatetime",result,true);
+        getStringBuilderPack(wmsShipping, result);
         getStringBuilderPack(wmsShipping, result);
 
         return result;
@@ -688,6 +713,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCreateUser(), "createUser", result);
+        DdlPreparedPack.timeBuilder(wmsFGInStock.getCreateDateTimeStart(),wmsFGInStock.getCreateDateTimeEnd(),"createDatetime",result,true);
 
         getStringBuilderPack(wmsFGInStock, result);
 
@@ -2051,6 +2078,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
 
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
+                DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
         getStringBuilderPack(wmsCSRange, result);
 
         return result;

pom.xml

@@ -128,6 +128,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-softswitch</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- spring-json转换 -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>