FTP适配器优化

表单功能优化
UA 适配 LONG类型

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

@@ -1069,6 +1069,88 @@ public class BlockFormEnumUtil {
 
 
     /**
+     * 元素编辑信息
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROPERTY_EDIT_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭"),
+        READONLY(3, "READONLY", "只读");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private PROPERTY_EDIT_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.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 PROPERTY_EDIT_STATUS 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 codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 属性字段排序规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -689,8 +689,9 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FTP_ENCODE {
-        CONN_SUCCESS(10, "UTF-8", "UTF-8"),
-        CONN_FAILURE(20, "GBK", "GBK");
+        UTF8(10, "UTF-8", "UTF-8"),
+        GBK(20, "GBK", "GBK"),
+        ISO88591(30, "ISO-8859-1", "ISO-8859-1");
 
         private int value;
         private String encode;

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

@@ -76,10 +76,6 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否编辑")
     private Integer isObjectEdit;
 
-    @Column(name = "IS_READ_ONLY_SHOW")
-    @ApiParam(value = "是否只读显示")
-    private Integer isReadOnlyShow;
-
     @Column(name = "IS_OBJECT_DEL")
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;

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

@@ -13,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 :
@@ -108,4 +110,8 @@ public class BfMethodDetailProperty extends BaseBean {
     @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
     @ApiParam(value ="关联对象元素属性Code")
     private String secElementPropertyCodeRdd;
+
+    @Transient
+    @ApiParam(value ="表单功能明细关联属性")
+    private List<BfMethodDetailPropertyRef> refList;
 }

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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-03-21 21:03
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BF_METHOD_DETAIL_PROPERTY")
+@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
+public class BfMethodDetailPropertyRef extends BaseBean {
+
+    private static final long serialVersionUID = -7541677357317732343L;
+    @Column(name="DETAIL_PROPERTY_ID")
+    @ApiParam(value ="功能明细关联属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long detailPropertyId;
+
+    @Column(name="PRI_ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="主对象元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long priElementPropertyId;
+
+    @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
+    @ApiParam(value ="主对象元素属性名称")
+    private String priElementPropertyNameRdd;
+
+    @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD")
+    @ApiParam(value ="主对象元素属性code")
+    private String priElementPropertyCodeRdd;
+
+    @Column(name="SEC_ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="关联对象元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long secElementPropertyId;
+
+    @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
+    @ApiParam(value ="关联对象元素属性名称")
+    private String secElementPropertyNameRdd;
+
+    @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
+    @ApiParam(value ="关联对象元素属性Code")
+    private String secElementPropertyCodeRdd;
+}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java

@@ -1,14 +0,0 @@
-//package cn.estsh.i3plus.pojo.form.repository;
-//
-//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty;
-//
-///**
-// * @Description : 元素约束属性
-// * @Reference :
-// * @Author : yunhao
-// * @CreateDate : 2019-03-21 20:27
-// * @Modify:
-// **/
-//public interface BfElementConstraintPropertyRepository extends BaseRepository<BfElementConstraintProperty, Long> {
-//}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.form.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.form.bean.BfMethodDetailPropertyRef;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-06-16 16:56
+ * @Modify:
+ **/
+public interface BfMethodDetailPropertyRefRepository extends BaseRepository<BfMethodDetailPropertyRef, Long> {
+}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -394,7 +394,6 @@ public final class FormHqlPack {
         return ddlPackBean;
     }
 
-
     /**
      * 数据对象查询条件拼接
      * @param bfCascade
@@ -409,4 +408,17 @@ public final class FormHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 数据对象查询条件拼接
+     * @param bfMethodDetailPropertyRef
+     * @return
+     */
+    public static DdlPackBean packHqlBfMethodDetailPropertyRef(BfMethodDetailPropertyRef bfMethodDetailPropertyRef){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetailPropertyRef);
+
+        DdlPreparedPack.getNumEqualPack(bfMethodDetailPropertyRef.getDetailPropertyId(), "detailPropertyId", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.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.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -10,6 +11,7 @@ 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;
@@ -38,19 +40,37 @@ public class BsSuitCaseFTP extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseId;
 
-    @Column(name = "file_Name")
+    @Column(name = "File_Name")
     @ApiParam(value = "文件名")
     private String fileName;
 
+    @Column(name = "FILE_ENCODE")
+    @ApiParam(value = "文件编码")
+    private String fileEncode;
+
+    @Column(name = "IS_TRANSFORM_MESSAGE")
+    @ApiParam(value = "是否转换报文")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isTransformMessage;
+
+    public int getIsTransformMessageVal() {
+        return isTransformMessage == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isTransformMessage;
+    }
+
+    public boolean isTransformMessage() {
+        return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsTransformMessageVal());
+    }
+
+
     @Column(name = "ENCODE")
-    @ApiParam(value = "编码")
+    @ApiParam(value = "ftp编码")
     private Integer encode;
 
     @Column(name = "IS_READ_AND_EMPTY")
     @ApiParam(value = "读取并清空")
     private Integer isReadAndEmpty;
 
-    public boolean isReadAndEmpty(){
+    public boolean isReadAndEmpty() {
         return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty);
     }
 
@@ -58,7 +78,7 @@ public class BsSuitCaseFTP extends BaseBean {
     @ApiParam(value = "读取并删除")
     private Integer isReadAndDelete;
 
-    public boolean isReadAndDelete(){
+    public boolean isReadAndDelete() {
         return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete);
     }
 
@@ -66,7 +86,7 @@ public class BsSuitCaseFTP extends BaseBean {
     @ApiParam(value = "是否需要遍历")
     private Integer isNeedTraversal;
 
-    public boolean isNeedTraversal(){
+    public boolean isNeedTraversal() {
         return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal);
     }
 
@@ -74,12 +94,12 @@ public class BsSuitCaseFTP extends BaseBean {
     @ApiParam(value = "是否增量读取")
     private Integer isIncrementalRead;
 
-    public boolean isIncrementalRead(){
+    public boolean isIncrementalRead() {
         return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead);
     }
 
     @Transient
-    @ApiParam(value = "是否增量读取")
+    @ApiParam(value = "临时适配路径")
     private String tempSuitFilePath;
 
     @Transient