From 919db8451e6b4fd4d731f38793b1a32e38856845 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 1 Mar 2021 16:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 22 +++++++++++++------ .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 +--- .../i3plus/pojo/aps/bean/MaterialSetTime.java | 14 ++++++------ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 18 ++++++++++++++++ .../i3plus/pojo/aps/model/ImportErrorInfo.java | 25 ++++++++++++++++++++++ 5 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 834acc7..59e4f4a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -28,23 +31,28 @@ import java.util.List; @Entity @Table(name = "APS_IMPORT_DETAIL") @Api("数据导入明细") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ImportDetail extends BaseAPS { private static final long serialVersionUID = 1264030397500660450L; - @Column(name="group_Name") - @ApiParam(value ="组名称") + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(notEmpty = true, mainkey = true) + private String name; + + @Column(name="GROUP_NAME") + @ApiParam(value ="分组名称") @FieldAnnotation(notEmpty = true) private String groupName; @Column(name="LINK_TYPE") @ApiParam(value ="链接类型") - @FieldAnnotation(defaultValue = "EXCEL") + @FieldAnnotation(defaultValue = "EXCEL", notEmpty = true) private ApsEnumUtil.DATA_LINK_TYPE linkType; @Column(name="PATH") @ApiParam(value ="IP/文件路径") - @FieldAnnotation(notEmpty = true) private String path; @Column(name="OUT_NAME") @@ -73,7 +81,7 @@ public class ImportDetail extends BaseAPS { @Column(name="IMPORT_TYPE") @ApiParam(value ="导入类型") - @FieldAnnotation(defaultValue = "REPLACE") + @FieldAnnotation(defaultValue = "DIFF") private ApsEnumUtil.IMPORT_DETAIL_TYPE importType; @Column(name="SKIP_ROWS") @@ -87,8 +95,8 @@ public class ImportDetail extends BaseAPS { private Integer orderNumber; @Column(name="PROJECT_ID") - @ApiParam(value ="导入项目ID") - @FieldAnnotation(relation = "Project") + @ApiParam(value ="导入项目") + @FieldAnnotation(relation = "Project", property = false) private Long projectId; public ImportProject getProject() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index 24134ab..7f1f95d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -51,6 +51,7 @@ public class ImportField extends BaseAPS { @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") + @FieldAnnotation(defaultValue = "255") private Integer maxLength; @Column(name="RELATION_TABLE") @@ -61,9 +62,6 @@ public class ImportField extends BaseAPS { @ApiParam("关联字段") private String relationField; - @Transient - private transient boolean hasDeal = false; - @Column(name="IMPORT_DETAIL_ID") @ApiParam(value ="导入明细ID") @FieldAnnotation(relation = "ImportDetail", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index b15a445..d77217c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -28,17 +28,17 @@ public class MaterialSetTime extends BaseAPS { private static final long serialVersionUID = -7996431489447641539L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true) private String resCode; @Column(name="PREV_MATERIAL") @ApiParam(value ="前物料编码") - @FieldAnnotation(notEmpty = true) + @FieldAnnotation(notEmpty = true, mainkey = true) private String prevMaterial; @Column(name="POST_MATERIAL") @ApiParam(value ="后物料编码") - @FieldAnnotation(notEmpty = true) + @FieldAnnotation(notEmpty = true, mainkey = true) private String postMaterial; @Column(name="TIME") @@ -46,8 +46,8 @@ public class MaterialSetTime extends BaseAPS { @FieldAnnotation(notEmpty = true) private String time; - @Column(name="PRIORITY") - @ApiParam(value ="优先级") - @FieldAnnotation(defaultValue = "10") - private Integer priority; +// @Column(name="PRIORITY") +// @ApiParam(value ="优先级") +// @FieldAnnotation(defaultValue = "10", mainkey = true) +// private Integer priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index a440ae8..1b91d43 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -313,6 +313,24 @@ public class BeanRelation { } /** + * 移除对象所有关系 + * + * @param bean + */ + public static void remove(BaseBean bean) { + if (bean == null) { + return; + } + BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); + if (beanInfo != null) { + List> holders = beanInfo.getAllHolders(); + for (Enum holder :holders) { + remove(bean, holder); + } + } + } + + /** * 移除关联 * * @param bean diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java new file mode 100644 index 0000000..c81550d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 导入校验错误信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-02-25 + * @Modify: + **/ +@Data +@Api("导入校验错误信息") +public class ImportErrorInfo { + private List headers = new ArrayList<>(); + private List> errorData = new ArrayList<>(100); + + public boolean hasErrorData() { + return !errorData.isEmpty(); + } +}