From 191220442f6bcbedcb4d87609c6901882d48eb99 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 1 Sep 2020 20:00:46 +0800 Subject: [PATCH] =?UTF-8?q?websocket=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 32 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationResultBean.java | 3 ++ 2 files changed, 35 insertions(+) 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 0d0d4ac..7b5637d 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 @@ -4967,4 +4967,36 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROMPT_SOUND { + SUCCESS(10, "扫描成功"), + FAILURE(20, "扫描失败"); + + private Integer value; + private String description; + + PROMPT_SOUND(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 4ce479b..5edd9e4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -65,4 +65,7 @@ public class StationResultBean implements Serializable { @ApiParam("定时秒数") private Integer timer; + + @ApiParam("提示音 1,2,3,4与前端约定") + private Integer promptSound; }