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

6 years ago · ff69583e8d
parent 19c0c1deb5 db019bf4eb
commit ff69583e8d
13 changed files with 47 additions and 63 deletions
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@ -149,6 +149,11 @@ public class Work extends BaseAPS {
    @FieldAnnotation(property = false)
    private Long parentWorkId;

+    @Column(name="MAIN_PLAN_ID")
+    @ApiParam(value ="主资源的工作计划")
+    @FieldAnnotation(property = false)
+    private Long mainPlanId;
+
    public BaseOrder getOrder() {
        return BeanRelation.get(this, EWork.Order);
    }
@ -206,5 +211,13 @@ public class Work extends BaseAPS {
        return BeanRelation.list(this, EWork.PlanFeedbacks);
    }

-    public WorkPlan getWorkPlan() { return BeanRelation.get(this, EWork.WorkPlan); }
+    public WorkPlan getMainPlan() { return BeanRelation.get(this, EWork.MainPlan); }
+
+    public void setMainPlan(WorkPlan plan) {
+        this.mainPlanId = plan != null ? plan.getId() : 0;
+        BeanRelation.set(this, EWork.MainPlan, plan);
+    }
+
+    @JsonBackReference
+    public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@ -68,7 +68,7 @@ public class WorkPlan extends BaseAPS {
    @Column(name="PRODUCE_BEGIN")
    @ApiParam(value ="生产开始时间")
    @FieldAnnotation(modify = false)
-    @RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin",
+    @RippleAnnotation(dependence = {"MainWork.PrevRelations.PrevWork.MainPlan.produceBegin",
        "PrevPlan.produceBegin"}, method = "calcPositive")
    private Date produceBegin;

@ -100,7 +100,7 @@ public class WorkPlan extends BaseAPS {
    @Column(name="LOCK_BEGIN")
    @ApiParam(value ="锁定开始时间")
    @FieldAnnotation(modify = false)
-    @RippleAnnotation(dependence = {"Work.PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock")
+    @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock")
    private Date lockBegin;

    @Column(name="LOCK_END")
@ -118,11 +118,6 @@ public class WorkPlan extends BaseAPS {
    @FieldAnnotation(property = false)
    private Long workResourceId;

-    @Column(name="MAIN_PLAN_ID")
-    @ApiParam(value ="主计划对象id")
-    @FieldAnnotation(property = false)
-    private Long mainPlanId;
-
    @Column(name="FURNACE_PLAN_ID")
    @ApiParam(value ="炉资源计划对象id")
    @FieldAnnotation(property = false)
@ -149,19 +144,18 @@ public class WorkPlan extends BaseAPS {
        BeanRelation.set(this, EWorkPlan.WorkResource, workResource);
    }

-    public WorkPlan getMainPlan() { return BeanRelation.get(this, EWorkPlan.MainPlan); }
-
-    public void setMainPlan(WorkPlan plan) {
-        this.mainPlanId = plan != null ? plan.getId() : 0l;
-        BeanRelation.set(this, EWorkPlan.MainPlan, plan);
-    }
-
-    public List<WorkPlan> getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); }
-
    public FurnacePlan getFurnacePlan() { return BeanRelation.get(this, EWorkPlan.FurnacePlan); }

    public void setFurnacePlan(FurnacePlan plan) {
        this.furnacePlanId = plan != null ? plan.getId() : 0;
        BeanRelation.set(this, EWorkPlan.FurnacePlan, plan);
    }
+
+    public Work getMainWork() {
+        return BeanRelation.get(this, EWorkPlan.MainWork);
+    }
+
+    public void setMainWork(Work work) {
+
+    }
 }
--- 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
@ -312,10 +312,6 @@ public class BeanRelation {
        }
    }

-    public static void setOne(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
-        get(bean).get(holder).add(relaBean);
-    }
-
    /**
     * 移除关联
     *
@ -359,37 +355,6 @@ public class BeanRelation {
    }

    /**
-     * 删除对象
-     *
-     * @param bean
-     */
-//    public static void delete(BaseBean bean) {
-//        if (bean == null) {
-//            return;
-//        }
-//        BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
-//        List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders();
-//        for (Enum<?> holder : ownerSigns) {
-//            Class<? extends BaseBean> relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass();
-//            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
-//            for (BaseBean relaBean : relaBeans) {
-//                //MemoryManager.delete(relaBean);
-//            }
-//        }
-//
-//        List<Enum<?>> normalSigns = beanInfo.getNormalSigns();
-//        for (Enum<?> holder : normalSigns) {
-//            Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
-//            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
-//            for (BaseBean relaBean : relaBeans) {
-//                if (reverseHolder != null) {
-//                    remove(relaBean, reverseHolder, bean);
-//                }
-//            }
-//        }
-//    }
-
-    /**
     * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。
     * @param bean
     * @param fun
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
@ -10,5 +10,6 @@ public enum EWork {
    PostRelations,  // 后关联
    Operation,      // 工序
    PlanFeedbacks,  // 工作计划反馈
-    WorkPlan    // 关联的为主资源的计划
+    MainPlan,    // 关联的为主资源的计划
+    WorkPlans,   // 关联的工作计划
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
@ -2,10 +2,9 @@ package cn.estsh.i3plus.pojo.aps.holders;

 public enum EWorkPlan {
    Work,
+    MainWork,
    Resource,
    WorkResource,
-    MainPlan,   // 关联的为主资源的工作计划
-    AssPlans,    // 关联的为副资源的工作计划
    PrevPlan,
    PostPlan,
    FurnacePlan,
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
@ -12,7 +12,9 @@
    </Relation>
    <Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
    </Relation>
-    <Relation field="WorkPlan" name="WorkPlan" reverse="Work" type="ONE_TO_ONE" owner="true">
+    <Relation field="MainPlan" name="WorkPlan" reverse="MainWork" type="ONE_TO_ONE">
+    </Relation>
+    <Relation field="WorkPlans" name="WorkPlan" reverse="Work" type="ONE_TO_MULTI" owner="true">
    </Relation>
    <Relation field="PlanFeedbacks" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
    </Relation>
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml
@ -2,8 +2,6 @@
 <Class name="WorkPlan">
    <Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
    </Relation>
-    <Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="true">
-    </Relation>
    <Relation field="PrevPlan" name="WorkPlan" reverse="PostPlan" type="MULTI_TO_MULTI" owner="false">
    </Relation>
 </Class>
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java
@ -21,13 +21,13 @@ public @interface AnnoOutputColumn {
    public String name() default "";

    // 关系对象显示的字段
-    public String value() default "";
+    public String value() default "description";

    // 显示格式
    public FORMAT format() default FORMAT.STRING;

    // 关联关系对象的Key
-    public String refForeignKey() default "";
+    public String refForeignKey() default "value";

    // 关系对象
    public Class refClass() default Object.class;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@ -85,6 +85,7 @@ public class ApsEnumUtil {
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum MATERIAL_REPORT_TYPE {
        PURCHASE("PURCHASE", "采购"),
+        PRODUCE("PRODUCE", "生产"),
        INVENTORY("INVENTORY", "库存");

        private String value;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@ -484,7 +484,8 @@ public class BlockSoftSwitchEnumUtil {
        MAP(40,"字典"),
        LIST(50,"列表"),
        JAVA_OBJECT(60,"Java Object"),
-        JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object");
+        JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object"),
+        ARRAY(70,"数组");

        private int value;
        private String description;
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java
@ -17,6 +17,8 @@ import java.util.List;
 /**
 * @Description : 数据元素
 * @Reference : Jenkins 自动合并代码测试
+ * @Reference : Jenkins 自动合并代码测试
+ * @Reference : Jenkins 自动合并代码测试
 * @Author : alwaysfrin
 * @CreateDate : 2018-12-25 19:54
 * @Modify:
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@ -1,6 +1,8 @@
 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.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
@ -8,13 +10,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.hibernate.annotations.DynamicInsert;
 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 : 适配器出入参
@ -44,6 +46,7 @@ public class BsSuitCaseParam extends BaseBean {

    @Column(name = "PARAM_TYPE_ID")
    @ApiParam(value = "参数类型，枚举(出,入)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_TYPE.class)
    private Integer paramTypeId;

    @Column(name = "PARAM_NAME")
@ -56,8 +59,13 @@ public class BsSuitCaseParam extends BaseBean {

    @Column(name = "PARAM_VAL_TYPE_ID")
    @ApiParam(value = "参数值类型")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class)
    private Integer paramValTypeId;

+    public int getParamValTypeIdVal() {
+        return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue();
+    }
+
    @Column(name = "PARAM_SORT")
    @ApiParam(value = "参数参数排序")
    private Integer paramSort;
--- a/pom.xml
+++ b/pom.xml
@ -63,7 +63,7 @@
            <version>2.9.2</version>
        </dependency>

-        <!-- 简化方法 -->
+        <!-- 简化方法1127 -->
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>