Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

 Conflicts:

	modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java

@@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS {
     private static final long serialVersionUID = -1869359887027950540L;
 
     @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
+    @ApiParam(value ="工作编码")
     @FieldAnnotation(relation = "Work")
     private Long workId;
 
@@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS {
     }
 
     @JsonBackReference
-    public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
+    public List<InterMediateDetail> getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java

@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup;
+import cn.estsh.i3plus.pojo.aps.model.RuleDetailModel;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -44,6 +46,9 @@ public class RuleGroup extends BaseAPS {
     @ApiParam(value ="当前执行的规则名称")
     private transient String curDetailName;
 
+    @FieldAnnotation(property = false)
+    private transient RuleDetailModel model;
+
     @JsonBackReference
     public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -5,6 +5,7 @@ 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.EWork;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
@@ -18,6 +19,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -264,4 +266,7 @@ public class Work extends BaseAPS {
         this.originWorkId = work != null ? work.getId() : 0;
         BeanRelation.set(this, EWork.OriginWork, work);
     }
+
+    @JsonBackReference
+    public List<InterMediateResult> getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -19,6 +19,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工作计划

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java

@@ -15,4 +15,5 @@ public enum EWork {
     SpecifyResource, // 指定资源
     DynSplitWorks, // 动态拆分后的工作
     OriginWork, // 动态拆分前的工作
+    EvaluateResult, // 资源评估结果
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class RuleDetailModel {
+    @ApiParam(value ="当前执行进度")
+    private Integer curProcess = 0;
+
+    @ApiParam(value ="总行数")
+    private Integer totalSize = 0;
+
+    @ApiParam(value ="进度消息")
+    private String processMsg = "";
+
+    private Boolean finish = false;
+
+    @ApiParam(value ="异常消息")
+    private String exception = "";
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java

@@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.tool;
 
 public class APSDoubleTool {
     public static boolean isZero(Double value) {
-        return (value == null) || (value > -0.000001 && value < 0.000001);
+        return (value == null) || (value > -0.0000001 && value < 0.0000001);
     }
 }

modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="InterMediateResult">
-    <Relation field="Work" name="Work" type="MULTI_TO_ONE">
-    </Relation>
     <Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
     </Relation>
     <Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">

modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml

@@ -22,4 +22,6 @@
     </Relation>
     <Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
     </Relation>
+    <Relation field="EvaluateResult" name="InterMediateResult" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
 </Class>

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import io.swagger.annotations.ApiModel;
+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 : pantianhu
+ * @CreateDate : 2021-05-26 17:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MDM_FIELD")
+@ApiModel("表字段")
+public class MdmField extends BaseMdmBean {
+
+    @Column(name="TABLE_NAME")
+    @ApiParam(value ="表名")
+    private String tableName;
+
+    @Column(name="FIELD_NAME")
+    @ApiParam(value ="字段名称")
+    private String fieldName;
+
+    @Column(name="FIELD_DESCRIPTION")
+    @ApiParam(value ="字段描述")
+    private String fieldDescription;
+
+    @Column(name="IS_SELECT")
+    @ApiParam(value ="是否选中")
+    private Integer isSelect;
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

@@ -93,7 +93,4 @@ public class MdmSyncData<T> implements Serializable {
 
     @ApiParam("同步失败信息")
     private String syncFailMessage;
-
-    @ApiParam("同步数据值")
-    private List<T> syncData;
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java

@@ -46,4 +46,8 @@ public class MdmExternalApp extends BaseBean {
     @ApiParam("回调地址")
     private String callbackUrl;
 
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private String operateType;
+
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mdm.repository.master;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.base.MdmField;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : pantianhu
+ * @CreateDate : 2021-05-26 20:33
+ * @Modify:
+ **/
+@Repository
+public interface MdmfieldRepository extends BaseRepository<MdmField, Long> {
+}