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

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

@@ -25,7 +25,8 @@ public class BlockSoftSwitchEnumUtil {
         DATASOURCE(30,"数据源套件"),
         WEB_SERVICE(40,"WebService套件"),
         MQ(50,"消息队列套件"),
-        WEB_SOCKET(60,"WebSocket套件");
+        WEB_SOCKET(60,"WebSocket套件"),
+        FTP(70,"FTP套件");
 
         private int value;
         private String description;
@@ -120,7 +121,8 @@ public class BlockSoftSwitchEnumUtil {
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
 
         /* Restful */
-        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"),
+        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"),
+        SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"),
 
         /* Socket */
         SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
@@ -128,7 +130,10 @@ public class BlockSoftSwitchEnumUtil {
 
         /* MQ */
         SERVER_MQ_RABBIT_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.MQ,250001,"RabbitMQ Server Hello测试服务"),
-        CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务");
+        CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"),
+
+        /* FTP */
+        CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器");
 
         private int value;
         private String description;
@@ -643,4 +648,96 @@ public class BlockSoftSwitchEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * ftp传输编码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FTP_ENCODE {
+        CONN_SUCCESS(10, "UTF-8", "UTF-8"),
+        CONN_FAILURE(20, "GBK", "GBK");
+
+        private int value;
+        private String encode;
+        private String description;
+
+        private FTP_ENCODE (int value,String encode, String description) {
+            this.value = value;
+            this.encode = encode;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getEncode() {
+            return encode;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].encode;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].encode.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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 FTP_ENCODE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+        public static String valueOfEncode(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].encode;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].encode.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
 
 /**
  * @Description :
@@ -170,6 +169,14 @@ public class CommonEnumUtil {
         public static String valueOfDescription(int val) {return valueOf(val);}
         public static int descriptionOfValue(String desc) {return descOf(desc);}
 
+        public static boolean valueOfBoolean(int val) {
+            if(val == TRUE.value){
+                return true;
+            }else {
+                return false;
+            }
+        }
+
     }
 
     /**
@@ -214,7 +221,7 @@ public class CommonEnumUtil {
         EXCEPTION(2, "异常"),
         EXCEPTION_DETAIL(3, "异常明细"),
         EXCEPTION_SOLUTION(4, "解决方案"),
-        EXCEPTION_ENUM(5, "枚举"),
+        ENUM(5, "枚举"),
         MODULE(10, "模块"),
         METHOD(11, "功能"),
         BUTTON(12, "按钮"),

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

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_CUSTOMER")
-@Api("客户产线代码")
+@Api("客户信息")
 public class MesCustomer extends BaseBean {
     @Column(name="CUSTOMER_CODE")
     @ApiParam("客户代码")

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

@@ -39,7 +39,5 @@ public class MesProdRouteCfg extends BaseBean {
     @ApiParam("流程代码")
     private String routeCode;
 
-    @Column(name = "ROUTE_TYPE")
-    @ApiParam("流程类型 10-扫描类型 20-监控类型")
-    private Integer routeType;
+
 }

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

@@ -35,12 +35,13 @@ public class MesRoute extends BaseBean {
     @ApiParam("流程名称")
     private String routeName;
 
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
+
     @Column(name = "POSITION")
     @ApiParam("GOJS位置")
     private String position;
 
 
-    @Column(name = "ROUTE_TYPE")
-    @ApiParam("流程类型 10-扫描类型 20-监控类型")
-    private Integer routeType;
 }

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

@@ -39,6 +39,9 @@ public class BsSuitCaseModel implements Serializable {
     @ApiParam(value = "REST 适配套件")
     private BsSuitCaseREST bsSuitCaseREST;
 
+    @ApiParam(value = "FTP 适配器")
+    private BsSuitCaseFTP bsSuitCaseFTP;
+
     @ApiParam(value = "分页数据")
     private Pager pager;
 

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

@@ -3,7 +3,6 @@ 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;
@@ -74,6 +73,14 @@ public class BsSslKey extends BaseBean {
     @ApiParam(value = "证书描述")
     private String keyDescription;
 
+    @Column(name = "KEY_USER_NAME")
+    @ApiParam(value = "证书账号")
+    private String keyUserName;
+
+    @Column(name = "KEY_PASSWORD")
+    @ApiParam(value = "证书密码")
+    private String keyPassword;
+
     @Transient
     @ApiParam(value = "证书参数集合")
     private List<BsSslKeyParam> bsSslKeyParamList;

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

@@ -0,0 +1,88 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+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;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-25 17:43
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_FTP")
+@Api(value = "FTP适配器", description = "FTP适配器")
+public class BsSuitCaseFTP extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "file_Name")
+    @ApiParam(value = "文件名")
+    private String fileName;
+
+    @Column(name = "ENCODE")
+    @ApiParam(value = "编码")
+    private Integer encode;
+
+    @Column(name = "IS_READ_AND_EMPTY")
+    @ApiParam(value = "读取并清空")
+    private Integer isReadAndEmpty;
+
+    public boolean isReadAndEmpty(){
+        return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty);
+    }
+
+    @Column(name = "IS_READ_AND_DELETE")
+    @ApiParam(value = "读取并删除")
+    private Integer isReadAndDelete;
+
+    public boolean isReadAndDelete(){
+        return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete);
+    }
+
+    @Column(name = "IS_NEED_TRAVERSAL")
+    @ApiParam(value = "是否需要遍历")
+    private Integer isNeedTraversal;
+
+    public boolean isNeedTraversal(){
+        return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal);
+    }
+
+    @Column(name = "IS_INCREMENTAL_READ")
+    @ApiParam(value = "是否增量读取")
+    private Integer isIncrementalRead;
+
+    public boolean isIncrementalRead(){
+        return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead);
+    }
+
+    @Transient
+    @ApiParam(value = "是否增量读取")
+    private String tempSuitFilePath;
+
+    @Transient
+    @ApiParam(value = "适配文件列表")
+    public List<BsSuitFile> bsSuitFileList;
+
+}

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

@@ -0,0 +1,78 @@
+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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-25 17:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_FILE")
+@Api(value = "适配文件信息", description = "适配文件信息")
+public class BsSuitFile extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "SUIT_CASE_NAME_RDD")
+    @ApiParam(value = "适配套件名称")
+    private String suitCaseName;
+
+    @Column(name = "SUIT_CASE_CODE")
+    @ApiParam(value = "适配套件代码")
+    private String suitCaseCode;
+
+    @Column(name = "FOLDER_PATH")
+    @ApiParam(value = "文件夹路径")
+    private String folderPath;
+
+    @Column(name = "FILE_ID")
+    @ApiParam(value = "文件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long fileId;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam(value = "文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam(value = "文件URL")
+    private String fileURL;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam(value = "文件大小")
+    private int fileSize;
+
+    @Column(name = "SUIT_DATE_TIME")
+    @ApiParam(value = "适配时间")
+    private String suitDateTime;
+
+    @Column(name = "PROCESS_STATE")
+    @ApiParam(value = "处理状态")
+    private Integer processState;
+
+    @Column(name = "PROCESS_TIME")
+    @ApiParam(value = "处理时间")
+    private String processTime;
+
+}

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

@@ -39,6 +39,10 @@ public class BsSuitSchedule extends BaseBean {
     @ApiParam(value = "适配套件名称")
     private String suitCaseNameRdd;
 
+    @Column(name = "SUIT_CASE_CODE")
+    @ApiParam(value = "适配套件代码")
+    private String suitCaseCode;
+
     @Column(name = "SCHEDULE_NAME")
     @ApiParam(value = "任务名称")
     private String scheduleName;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.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.BsSuitCaseFTP;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-27 10:16
+ * @Modify:
+ **/
+public interface BsSuitCaseFTPRepository extends BaseRepository<BsSuitCaseFTP,Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseREST;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-23 15:39
+ * @Modify:
+ **/
+@Repository
+public interface BsSuitCaseRESTRepository extends BaseRepository<BsSuitCaseREST,Long> {
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.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.BsSuitFile;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-27 10:17
+ * @Modify:
+ **/
+public interface BsSuitFileRepository extends BaseRepository<BsSuitFile,Long> {
+}

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

@@ -4,8 +4,19 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.softswitch.bean.*;
-import org.apache.commons.lang3.StringUtils;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
+import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
 
 /**
  * @Description :
@@ -168,7 +179,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
 
@@ -350,4 +361,24 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
+
+    /**
+     * 适配文件条件封装
+     * @param bsSuitFile 查询条件
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitCaseFile(BsSuitFile bsSuitFile){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseName(),"suitCaseName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean);
+        DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true);
+
+        ddlPackBean.setOrderByStr(bsSuitFile.orderBy());
+
+        return ddlPackBean;
+    }
 }