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 1/2] =?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 ""; From e3373387d27fc4d03bdfc89a770492fb4183369e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 May 2022 11:37:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../andon/model/AndonStatusInterfaceCfgModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java new file mode 100644 index 0000000..18fd5bb --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ +@Data +@ApiModel("安灯事件界面配置MODEL") +public class AndonStatusInterfaceCfgModel implements Serializable { + + private static final long serialVersionUID = -4504617079257753276L; + + @ApiParam("界面代码") + private String value; + + @ApiParam("界面名称") + private String description; + +}