From b0b276ba6649ac5500f49357e2c541627465ebd5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 28 May 2020 15:17:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1938]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonAlarmType.java | 21 +++++++++++++++++++++ .../i3plus/pojo/andon/bean/AndonMessageRecord.java | 10 ++++++---- .../i3plus/pojo/andon/bean/AndonRouteStatus.java | 12 ++++++++++++ .../andon/bean/AndonRouteStatusErrorRecord.java | 14 ++++++++++---- .../andon/model/AndonActionModuleGroupModel.java | 2 +- .../i3plus/pojo/andon/model/CommonMsgModel.java | 3 --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 1 - 7 files changed, 50 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java index 76d4137..83b067d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -38,4 +39,24 @@ public class AndonAlarmType extends BaseBean implements Serializable { @ApiParam("安灯类型名称") private String alarmName; + @Column(name = "CODE") + @ApiParam("菜单编号") + private String code; + + @Column(name = "COLOR") + @ApiParam("BI颜色") + private String color; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Transient + @ApiParam("安灯类型代码") + private String value; + + @Transient + @ApiParam("安灯类型名称") + private String description; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java index 59d4a55..e34f15d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java @@ -10,10 +10,7 @@ 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; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -81,4 +78,9 @@ public class AndonMessageRecord extends BaseBean implements Serializable { @Column(name = "MEMO") @ApiParam(value = "备注") private String memo; + + @Lob + @Column(name = "MESSAGE") + @ApiParam(value = "广播内容") + private String message; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index 1724576..8367100 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -96,4 +96,16 @@ public class AndonRouteStatus extends BaseBean implements Serializable { @ApiParam("触发类型默认不需要外部触发") private boolean checkTriggerTypeFalg = false; + @Transient + @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent") + private String nextTriggerEvent; + + @Transient + @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent") + private boolean execNextModuleFlag = true; + + @Transient + @ApiParam("默认异常未处理") + private boolean doErrorFlag = false; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index b6cbca9..fcbecc0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -9,10 +9,7 @@ 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; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -64,4 +61,13 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl @ApiParam(value = "安灯来源类型") private String sourceType; + @Column(name = "CACHE_FLAG") + @ApiParam(value = "缓存标识") + private Integer cacheFlag; + + @Lob + @Column(name = "CONTENT") + @ApiParam(value = "内容") + private String content; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java index 18c8643..a616354 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java @@ -31,6 +31,6 @@ public class AndonActionModuleGroupModel implements Serializable { @ApiParam("流程组件参数集合") private List routeModuleParamList; - @ApiParam("区域流程组件参数集合") + @ApiParam("安灯流程组件参数集合") private List alarmRouteModuleParamList; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 109a2cc..85f3f30 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -42,7 +42,4 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("触发事件") private String triggerEvent; - @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent") - private String nextTriggerEvent; - } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 313523c..bddd84b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -1175,7 +1175,6 @@ public class AndonEnumUtil { } } - /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 *