From c4dceace9276872332b5a957d6b3fee96c6fdb1b Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sun, 9 Jun 2019 15:41:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 89 ++++++++++++++++++++++ .../pojo/form/bean/BfDataObjectProperty.java | 12 +++ .../i3plus/pojo/model/form/CloudFormModel.java | 4 +- 3 files changed, 103 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index e620424..0c6b49f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2322,4 +2322,93 @@ public class BlockFormEnumUtil { return tmp; } } + + /** + * 条件运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONDITIONAL_OPERATOR { + EQUAL(1, "=", "等于"), + NOT_EQUAL(2, "<>", "不等于"), + MORE(3, ">", "大于"), + LESS(4, "<", "小于"), + MORE_OR_EQUAL(5, ">=", "大于等于"), + LESS_OR_EQUAL (6, "<=", "小于等于"), + LIKE(7, "LIKE", "全模糊"), + START_LIKE(7, "LIKE", "前模糊"), + END_LIKE(7, "LIKE", "后模糊"), + IN(8, "in", "in"); + + private int value; + private String code; + private String description; + + private CONDITIONAL_OPERATOR(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.toLowerCase())) { + 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 CONDITIONAL_OPERATOR 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; + } + } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index e1f0536..4cc4f2b 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 数据对象 @@ -95,8 +96,19 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="默认查询条件") private Integer objectColumnCustomWhere; + public int getObjectColumnCustomWhereVal(){ + if(objectColumnCustomWhere == null){ + objectColumnCustomWhere = -1; + } + return objectColumnCustomWhere; + } + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; + @Transient + @ApiParam(value ="元素值集合") + private transient List propertyFormValueList; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java index 9669922..9a9546a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java @@ -36,8 +36,8 @@ public class CloudFormModel { // 新增数据 private List> insertList; - // 修改数据 - private List> updateList; + // 修改条件 + private List updateConditionList; // 查询数据 private List selectList; From db461a76ba8924e9d74bfb40f13609f2213a9a99 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sun, 9 Jun 2019 17:57:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E4=BB=B6=E5=88=A0=E9=99=A4=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E9=BB=98=E8=AE=A4=E5=B1=9E=E6=80=A7=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=89=80=E6=9C=89=E8=A1=A8=E7=9A=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?= =?UTF-8?q?SQLServer=E4=B8=8D=E6=94=AF=E6=8C=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java index 9a9546a..3ce913c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java @@ -46,7 +46,7 @@ public class CloudFormModel { private Long select; // 删除数据 - private List deleteList; + private List deleteConditionList; // 删除数据ID private Long delete; From 4a7081f90b7c26d7eaebb3082a2272813b55bdc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sun, 9 Jun 2019 21:14:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=20SAP=20=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BD=AC=E6=8D=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=9A=84=20POJO=20=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/MappingItem.java | 28 +++++++ .../wms/dbinterface/WmsInterfaceDataMapper.java | 91 ++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java new file mode 100644 index 0000000..dcc37c8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * WMS - SAP 字段映射关系 + * 暂时不考虑字段的类型 + * + * @author Rock.Yu + * @since 2019-06-09 21:06 + */ +@Data +@AllArgsConstructor +public class MappingItem { + /** + * 来源字段名称 + */ + public String srcName; + /** + * 目标对象的属性名称 + */ + public String destName; + /** + * 当来源数据中无此字段时的默认值 + */ + public String defaultValue; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java new file mode 100644 index 0000000..1314211 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * WMS - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_INTERFACE_DATA_MAPPER") +@Api("接口数据映射") +public class WmsInterfaceDataMapper extends BaseBean { + /** + * 排序编号 + */ + @Column(name = "SEQ") + public int seq; + /** + * 来源表的每次查询记录数，防止大量数据造成内存溢出 + */ + @Column(name = "SRC_GET_LIMIT") + public int srcGetLimit; + /** + * 接口数据源编号（在动态表单中配置） + */ + @Column(name = "SCR_DATA_SOURCE", length = 50) + public String dataSource; + /** + * 来源表名 + */ + @Column(name = "SCR_TABLE_NAME", length = 50) + public String srcTableName; + /** + * 来源表的排序条件 + */ + @Column(name = "SCR_ORDER_BY", length = 50) + public String srcOrderBy; + /** + * 来源表的查询条件 + */ + @Column(name = "SCR_WHERE", length = 255) + public String scrWhere; + /** + * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 + * 例如：SYNFLG=Y,SYNDATE={Date} + */ + @Column(name = "SCR_UPDATE_SYNC", length = 255) + public String srcUpdateSync; + /** + * 业务表单的主键，多个主键用半角逗号分隔 + */ + @Column(name = "SCR_PK_COLUMNS", length = 255) + public String srcPkColumns; + /** + * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据） + */ + @Column(name = "COPY_BY_ORGS", length = 50) + public String copyByOrgs; + /** + * 目标实体对象的名字 + */ + @Column(name = "DEST_BEAN_NAME", length = 50) + public String destBeanName; + /** + * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 + */ + @Column(name = "DEST_PK_PROPERTIES", length = 50) + public String destPkProperties; + /** + * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储 + * + */ + @Column(name = "DEST_COLUMN_MAPPING", length = 5000) + public String destColumnMapping; +}