From 7487be0a8a0a8da0af3ef8b3727f78faeb4293e5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 May 2022 11:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java | 5 +---- .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java index 8e3ff3c..1794089 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java @@ -85,4 +85,8 @@ public class AndonManageRouteErrorRecord extends BaseBean implements Serializabl @ApiParam(value = "处理状态") private Integer handleStatus; + @Column(name = "ALARM_ERROR_TIME") + @ApiParam("安灯异常时间") + public String alarmErrorTime; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java index 9df0a79..ac70dd0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java @@ -17,9 +17,6 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ private static final long serialVersionUID = -3122891627710528829L; - @ApiParam("组织代码") - private String organizeCodeExt = "test"; - @Override public String toString() { return "StationRequestBean{" + @@ -40,7 +37,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ ", fsmList=" + get(fsmList) + ", curFsm=" + get(curFsm) + ", triggerEvent='" + get(triggerEvent) + '\'' + - ", organizeCodeExt='" + get(organizeCodeExt) + '\'' + + ", alarmErrorTime='" + get(alarmErrorTime) + '\'' + '}'; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java index ef772de..5035598 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java @@ -77,6 +77,9 @@ public abstract class StationRequestBeanAb implements Serializable { @ApiParam("当前触发事件") public String triggerEvent; + @ApiParam("安灯异常时间") + public String alarmErrorTime; + public String get(Object obj) { if (null == obj) { return "";