diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 885c8f0..7fc29e9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -70,8 +70,9 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(10, "展示组件"), - BUTTON_MODULE(30, "按钮组件"); + REVEAL_MODULE(20, "展示组件"), + BUTTON_MODULE(30, "按钮组件"), + TIMING_MODULE(40, "定时组件"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 6f4c656..c9c15e5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -18,8 +18,9 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(10, "展示组件"), - BUTTON_MODULE(30, "按钮组件"); + REVEAL_MODULE(20, "展示组件"), + BUTTON_MODULE(30, "按钮组件"), + TIMING_MODULE(40, "定时组件"); private int value; private String description; @@ -4073,6 +4074,52 @@ public class MesPcnEnumUtil { } /** + * 停机类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * plc状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT)