Merge remote-tracking branch 'origin/dev' into test

5 years ago · 378205ef61
parent faad8cf4c8 cc947c08f5
commit 378205ef61
28 changed files with 167 additions and 36 deletions
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-base-mongo/pom.xml
+++ b/modules/i3plus-pojo-base-mongo/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java
@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean;

 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModelProperty;

 import java.util.List;
 import java.util.Map;
@ -16,37 +16,37 @@ import java.util.Map;
 **/
 public class BaseResultBean<Obj> {

-    @ApiParam("是否成功")
+    @ApiModelProperty("是否成功")
    public boolean success;

-    @ApiParam("信息代码-国际化")
+    @ApiModelProperty("信息代码-国际化")
    public String code;

-    @ApiParam("操作消息")
+    @ApiModelProperty("操作消息")
    public String msg;

-    @ApiParam("错误消息")
+    @ApiModelProperty("错误消息")
    public String errorMsg;

-    @ApiParam("http路径")
+    @ApiModelProperty("http路径")
    public String url;

-    @ApiParam("List结果集")
+    @ApiModelProperty("List结果集")
    public List<Obj> resultList;

-    @ApiParam("单个结果")
+    @ApiModelProperty("单个结果")
    public Obj resultObject;

-    @ApiParam("翻页和结果集")
+    @ApiModelProperty("翻页和结果集")
    public ListPager<Obj> listPager;

-    @ApiParam("Map结果集")
+    @ApiModelProperty("Map结果集")
    public Map<String, Object> resultMap;

-    @ApiParam("翻页操作")
+    @ApiModelProperty("翻页操作")
    public Pager pager;

-    @ApiParam("总记录数")
+    @ApiModelProperty("总记录数")
    public int totalCount;

    public boolean isSuccess() {
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- 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
@ -79,6 +79,10 @@ public class BfDataObjectProperty extends BaseBean {
    @ApiParam(value ="是否主键")
    private Integer isPrimaryKey;

+    public boolean isPrimaryKey(){
+        return isPrimaryKey != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isPrimaryKey);
+    }
+
    @Column(name="IS_NULLABLE")
    @ApiParam(value = "是否允许为空")
    private Integer isNullable;
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;

@ -140,6 +141,11 @@ public class BfElement extends BaseBean {
    @ApiParam(value = "是否导出")
    private Integer isObjectExport;

+    @ColumnDefault("2")
+    @Column(name = "IS_OBJECT_IMPORT")
+    @ApiParam(value = "是否导入")
+    private Integer isObjectImport;
+
    @Column(name="ELEMENT_SORT_ATTR_ID")
    @ApiParam(value ="默认排序属性")
    @JsonSerialize(using = ToStringSerializer.class)
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.form.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
+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;
@ -87,6 +88,10 @@ public class BfElementProperty extends BaseBean {
    @ApiParam(value = "是否必填")
    private Integer propertyValueNotNull;

+    public boolean isPropValNotNull() {
+        return propertyValueNotNull == null || propertyValueNotNull == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+    }
+
    @Column(name = "PROPERTY_IS_FIND")
    @ApiParam(value = "是否查询条件")
    private Integer propertyIsFind;
@ -123,6 +128,14 @@ public class BfElementProperty extends BaseBean {
    @ApiParam(value = "显示顺序")
    private Integer propertySort;

+    @Column(name = "IS_SUPPORT_IMPORT")
+    @ApiParam(value = "是否支持导入")
+    private Integer isSupportImport;
+
+    public boolean isSupportImport() {
+        return isSupportImport != null && isSupportImport == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+    }
+
    @Column(name = "PROPERTY_CONTROL_TYPE")
    @ApiParam(value = "控件类型")
    private Integer propertyControlType;
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java
@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import cn.estsh.i3plus.pojo.base.dynamic.DynamicEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-11-17 16:32
+ * @Modify:
+ **/
+@Data
+@ApiModel("检查唯一返回结果model")
+public class BfCheckOnlyResultModel {
+
+    @ApiModelProperty("是否唯一")
+    private boolean isOnly;
+
+    @ApiModelProperty("重复的数据")
+    private DynamicEntity repeatData;
+
+    @ApiModelProperty("异常信息")
+    private Exception exception;
+
+    public BfCheckOnlyResultModel() {
+        this.isOnly = true;
+    }
+}
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java
@ -5,9 +5,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;

 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;

 /**
@ -16,12 +16,12 @@ import java.util.List;
 * @Description:
 **/
@Data
-@NoArgsConstructor
@AllArgsConstructor
@Api("mes导入结果model")
 public class ExcelImportModel<T> implements Serializable {

    private static final long serialVersionUID = 3075276018074690913L;
+
    @ApiParam("结果")
    private boolean result;

@ -32,7 +32,7 @@ public class ExcelImportModel<T> implements Serializable {
    private int failRowNum;

    @ApiParam("错误信息集合")
-    private List<ImportErrorModel> ImportErrorModels;
+    private List<ImportErrorModel> importErrorModels;

    @ApiParam("错误的行号")
    private String errorRows;
@ -46,4 +46,17 @@ public class ExcelImportModel<T> implements Serializable {
    @ApiParam("Sheet名称")
    private String sheetName;

+
+    public ExcelImportModel() {
+        result = true;
+    }
+
+    public void addErrorMsg(ImportErrorModel errorModel) {
+        if (importErrorModels == null) {
+            importErrorModels = new ArrayList<>();
+        }
+        importErrorModels.add(errorModel);
+        result = false;
+    }
+
 }
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java
@ -21,9 +21,19 @@ import java.io.Serializable;
 public class ImportErrorModel implements Serializable {

    private static final long serialVersionUID = 1212013821950324792L;
+
+    @ApiParam("sheet名称")
+    private String sheetName;
+
    @ApiParam("错误的行号")
    private int rowNum;

+    @ApiParam("错误的列号")
+    private int colNum;
+
+    @ApiParam("错误的列名")
+    private String colName;
+
    @ApiParam("错误数量")
    private int errorNum;

@ -33,4 +43,58 @@ public class ImportErrorModel implements Serializable {
    @ApiParam("错误描述")
    private String errorInfo;

+    public static final class Builder {
+        private String sheetName;
+        private int rowNum;
+        private int colNum;
+        private String colName;
+        private String errorInfo;
+
+        private Builder() {
+        }
+
+        public static Builder newBuilder() {
+            return new Builder();
+        }
+
+        public Builder withSheetName(String sheetName) {
+            this.sheetName = sheetName;
+            return this;
+        }
+
+        public Builder withRowNum(int rowNum) {
+            this.rowNum = rowNum;
+            return this;
+        }
+
+        public Builder withColNum(int colNum) {
+            this.colNum = colNum;
+            return this;
+        }
+
+        public Builder withColName(String colName) {
+            this.colName = colName;
+            return this;
+        }
+
+        public Builder withErrorInfo(String errorInfo) {
+            this.errorInfo = errorInfo;
+            return this;
+        }
+
+        public ImportErrorModel build() {
+            ImportErrorModel importErrorModel = new ImportErrorModel();
+            importErrorModel.setSheetName(sheetName);
+            importErrorModel.setRowNum(rowNum);
+            importErrorModel.setColNum(colNum);
+            importErrorModel.setColName(colName);
+            if(errorInfo== null){
+                importErrorModel.setErrorInfo("SHEET【" + sheetName + "】中第【" + rowNum + "】行，第【" + colNum + "】列 " +
+                        colName + " 数据为空");
+            }else {
+                importErrorModel.setErrorInfo(errorInfo);
+            }
+            return importErrorModel;
+        }
+    }
 }
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -15,7 +15,7 @@
    <groupId>i3plus.pojo</groupId>
    <artifactId>i3plus-pojo</artifactId>
    <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
    <modules>
        <module>modules/i3plus-pojo-base</module>
        <module>modules/i3plus-pojo-platform</module>