From 84d341aa87eee167692ddae69a10eb0cd548c6c9 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 27 Nov 2019 13:49:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Jenkins=20=E8=87=AA=E5=8A=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java | 2 ++ 1 file changed, 2 insertions(+) diff --git 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 index 9bb77d3..8662f2b 100644 --- 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: From 987946b3eb84afb58b1d8398db3221f5f585c2cb Mon Sep 17 00:00:00 2001 From: jenkins <1677739127@qq.com> Date: Wed, 27 Nov 2019 14:17:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b2c3eb..aea4d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 2.9.2 - + org.projectlombok lombok From 0dddbb936c1aa5d4625ed32489a7d99eda2449a6 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 Nov 2019 14:36:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 15 +++++++++- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 26 +++++++--------- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 35 ---------------------- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 3 +- .../src/main/resources/relations/Work.xml | 4 ++- .../src/main/resources/relations/WorkPlan.xml | 2 -- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1 + 8 files changed, 31 insertions(+), 58 deletions(-) diff --git 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 index 5eee173..3c5303c 100644 --- 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 getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); } } diff --git 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 index 09daae4..d63e4a4 100644 --- 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 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) { + + } } 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 a6aa5e5..0cd8116 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 @@ -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> ownerSigns = beanInfo.getOwnerHolders(); -// for (Enum holder : ownerSigns) { -// Class relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass(); -// List relaBeans = new ArrayList<>(list(bean, holder)); -// for (BaseBean relaBean : relaBeans) { -// //MemoryManager.delete(relaBean); -// } -// } -// -// List> normalSigns = beanInfo.getNormalSigns(); -// for (Enum holder : normalSigns) { -// Enum reverseHolder = beanInfo.getReverseHolder(holder); -// List relaBeans = new ArrayList<>(list(bean, holder)); -// for (BaseBean relaBean : relaBeans) { -// if (reverseHolder != null) { -// remove(relaBean, reverseHolder, bean); -// } -// } -// } -// } - - /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 * @param bean * @param fun diff --git 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 index 47da0e1..240fc04 100644 --- 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, // 关联的工作计划 } diff --git 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 index 490bddc..025e156 100644 --- 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, diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index ef8abd5..7e7253e 100644 --- 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 @@ - + + + diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 1adb280..49eb584 100644 --- 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 @@ - - \ No newline at end of file diff --git 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 index f1c1054..f5e1d7f 100644 --- 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; From 26e7f975bf842e6d68af9547aa7b2b9891cba276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 27 Nov 2019 15:47:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8=E6=94=AF=E6=8C=81IN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java | 4 ++-- .../i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 10 +++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git 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 index f913d0f..c629367 100644 --- 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; diff --git 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 index fdd5391..b4f4a10 100644 --- 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; diff --git 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 index 772bee5..6257a7b 100644 --- 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;