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

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

@@ -159,13 +159,6 @@ public class Pager {
     }
 
     public int getEndRow() {
-        if(pageSize > 0){
-            if(currentPage > 1){
-                return currentPage * pageSize;
-            }else {
-                return pageSize;
-            }
-        }
         return endRow;
     }
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;

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

@@ -918,4 +918,147 @@ public class BlockSoftSwitchEnumUtil {
 
     }
 
+    /**
+     * 脚本类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SCRIPT_TYPE {
+        MESSAGE_PROCESS(10, "报文处理","可用参数:transData,orginData");
+
+        private int value;
+        private String description;
+        private String scriptRule;
+
+        private BS_SCRIPT_TYPE (int value, String description,String scriptRule) {
+            this.value = value;
+            this.description = description;
+            this.scriptRule = scriptRule;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+        public String getScriptRule() {
+            return scriptRule;
+        }
+
+        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;
+        }
+
+        public static BS_SCRIPT_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
+
+    /**
+     * 脚本语言
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SCRIPT_LANGUAGE {
+//        SPEL(10, "Spring表达式语言(SpEL)"),
+        JAVASCRIPT(20, "JavaScript(JS)");
+
+        private int value;
+        private String description;
+
+        private BS_SCRIPT_LANGUAGE (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;
+        }
+
+        public static BS_SCRIPT_LANGUAGE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
+
+    /**
+     * 脚本执行方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SCRIPT_EXECUTE_METHOD {
+        EXECUTE_SCRIPT(10, "执行脚本"),
+        EXECUTE_METHOD(20, "执行方法"),
+        EXECUTE_OBJECT_METHOD(30, "执行对象方法");
+
+        private int value;
+        private String description;
+
+        private BS_SCRIPT_EXECUTE_METHOD (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;
+        }
+
+        public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 
 /**
  * @Description :
@@ -1573,7 +1574,7 @@ public class CommonEnumUtil {
         BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null),
         BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null),
-        DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss");
+        DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", Timestamp.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss");
 
         /**
          * 属性类型值
@@ -1911,6 +1912,19 @@ public class CommonEnumUtil {
             return null;
         }
 
+        public String getJDBCUrl(String database,String host,Integer port,String instanceName){
+            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
+                return getJDBCUrlMySQL(database,host,port);
+            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
+                return getJDBCUrlOracle(database,host,port);
+            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
+                return getJDBCUrlPostgreSQL(database,host,port);
+            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
+                return getJDBCUrlSQLServer(database,host,port,instanceName);
+            }
+            return null;
+        }
+
         public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
             if(StringUtils.isNotBlank(databaseProductName)){
                 if(databaseProductName.indexOf(":mysql:") != -1){
@@ -1941,6 +1955,22 @@ public class CommonEnumUtil {
         private String getJDBCUrlSQLServer(String database,String host,Integer port){
             return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
         }
+
+        private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
+            StringBuffer sb = new StringBuffer();
+            sb.append("jdbc:sqlserver://").append(host);
+            // 实例
+            if (StringUtils.isNotBlank(instanceName)) {
+                sb.append("\\").append(instanceName);
+            }
+            //  端口
+            sb.append(":").append(port);
+            // 数据库
+            sb.append(";database=").append(database);
+            // 自动重连
+            sb.append(";autoReconnect=true");
+            return sb.toString();
+        }
     }
 
     /**

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

@@ -290,6 +290,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("客户集合")
     private List<String> custList;
 
+    @Transient
+    @ApiParam("工位完成数量")
+    private Integer stationCompleteQty = 0;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -105,6 +105,8 @@ public class SuitClientModel implements Serializable {
     @XStreamCDATA
     private Object suitResultMessage;
 
+    private boolean isNeedRetry = false;
+
     public SuitClientModel() {
     }
 

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

@@ -345,8 +345,8 @@ public class CoreHqlPack {
     public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) {
         DdlPackBean result = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result);
         DdlPreparedPack.getStringEqualPack(role.getName(), "name", result);
-        DdlPreparedPack.getNumEqualPack(role.getId(), "id", result);
         return result;
     }
 

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

@@ -0,0 +1,107 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.math.NumberUtils;
+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 : 2020-07-28 14:35
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_BUSI_SCRIPT")
+@ApiModel(value = "业务脚本", description = "业务脚本")
+public class BsBusiScript extends BaseBean {
+
+    private static final long serialVersionUID = 1419277265159912600L;
+
+    @Column(name = "SCRIPT_NAME")
+    @ApiModelProperty(value = "脚本名称")
+    private String scriptName;
+
+    @Column(name = "SCRIPT_CODE")
+    @ApiModelProperty(value = "脚本代码")
+    private String scriptCode;
+
+    @Column(name = "SCRIPT_TYPE")
+    @ApiModelProperty(value = "脚本类型")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.class)
+    private Integer scriptType;
+
+    public String getScriptTypeTxt() {
+        return scriptType == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.valueOfDescription(scriptType);
+    }
+
+    @Column(name = "SCRIPT_LANGUAGE")
+    @ApiModelProperty(value = "脚本语言")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.class)
+    private Integer scriptLanguage;
+
+    public String getScriptLanguageTxt() {
+        return scriptLanguage == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.valueOfDescription(scriptLanguage);
+    }
+
+    @Column(name = "SCRIPT_EXECUTE_METHOD")
+    @ApiModelProperty(value = "脚本执行方式")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.class)
+    private Integer scriptExecuteMethod;
+
+    public String getScriptExecuteMethodTxt() {
+        return scriptExecuteMethod == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.valueOfDescription(scriptExecuteMethod);
+    }
+
+    @Column(name = "SCRIPT_OBJ_NAME")
+    @ApiModelProperty(value = "脚本对象名称")
+    private String scriptObjName;
+
+    @Column(name = "SCRIPT_METHOD_NAME")
+    @ApiModelProperty(value = "脚本方法名称")
+    private String scriptMethodName;
+
+    @Column(name = "SCRIPT_CONTENT")
+    @ApiModelProperty(value = "脚本内容")
+    private String scriptContent;
+
+    @Column(name = "SCRIPT_DESC")
+    @ApiModelProperty(value = "脚本描述")
+    private String scriptDesc;
+
+    @Column(name = "REF_ID")
+    @ApiModelProperty(value = "关联id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long refId;
+
+    @Column(name = "SCRIPT_VERSION")
+    @ApiModelProperty(value = "脚本版本")
+    private Integer scriptVersion;
+
+    public int getScriptVersion(){
+        return scriptVersion == null ? NumberUtils.INTEGER_ONE : scriptVersion;
+    }
+
+    public BsBusiScript nextVersion() {
+        setScriptVersion(getScriptVersion() + 1);
+        return this;
+    }
+
+}

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

@@ -52,6 +52,10 @@ public class BsDataSource extends BaseBean {
     @ApiParam(value = "数据源端口")
     private Integer dataSourcePort;
 
+    @Column(name = "DATA_SOURCE_INSTANCE_NAME")
+    @ApiParam(value = "数据源实例名称")
+    private String dataSourceInstanceName;
+
     @Column(name = "DATA_SOURCE_USER")
     @ApiParam(value = "用户名")
     private String dataSourceUser;

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+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;
@@ -34,6 +36,7 @@ public class BsLongData extends BaseBean {
     private static final long serialVersionUID = -329128754646765129L;
     @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long refId;
 
     @Column(name = "REF_DATA_TYPE")

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -40,6 +41,7 @@ public class BsSuitCase extends BaseBean {
 
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
     private Integer caseTypeId;
 
     public int getCaseTypeIdVal(){
@@ -76,6 +78,7 @@ public class BsSuitCase extends BaseBean {
 
     @Column(name = "SUIT_MODE_ID")
     @ApiParam(value = "适配模式(枚举,主动，被动)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_MODE.class)
     private Integer suitModeId;
 
     @Column(name = "SUIT_ACTION_ID")
@@ -230,6 +233,10 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配器状态")
     private Integer suitCaseStatus;
 
+    @Column(name = "BIND_BUSI_SCRIPT_CODE")
+    @ApiParam(value = "绑定业务脚本Code")
+    private String bindBusiScriptCode;
+
     @Transient
     @ApiParam(value = "适配器套件明细")
     private  Object bsSuitCaseDetail;

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

@@ -133,6 +133,10 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    @Column(name = "SCRIPT_RESULT")
+    @ApiParam(value = "脚本结果")
+    private String scriptResult;
+
     @Transient
     @ApiParam(value = "适配记录参数")
     private List<BsSuitRecordParam> bsSuitRecordParamList;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 请求适配记录
@@ -46,10 +47,12 @@ public class BsSuitRequestRecord extends BaseBean {
     private Integer requestSource;
 
     // 移动至记录数据表
-    @Lob
     @Column(name = "REQUEST_ORGIN_PARAM")
     @ApiParam(value = "请求原始参数")
     private String requestOrginParam;
 
+    @Transient
+    @ApiParam(value = "id-查询条件")
+    private List<Long> searchIdList;
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsBusiScript;
+
+/**
+ * @Description : 业务脚本
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-07-28 15:13
+ * @Modify:
+ **/
+public interface BsBusiScriptRepository extends BaseRepository<BsBusiScript,Long> {
+}

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

@@ -261,7 +261,7 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -323,6 +323,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitRecord.getScriptResult(),"scriptResult",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
@@ -367,6 +368,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord);
 
+        DdlPreparedPack.getInPackList(bsSuitRequestRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
 
@@ -416,7 +418,16 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsLongData);
         DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
         DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean);
-        DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsLongData.getData(),"data",ddlPackBean);
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlBsBusiScript(BsBusiScript bsBusiScript){
+        DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsBusiScript);
+        DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptName(),"scriptName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptCode(),"scriptCode",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsBusiScript.getScriptType(),"scriptType",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean);
         return ddlPackBean;
     }
 }