From 47baf16e0f4171602393de5315b18245fd64c512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 31 May 2019 10:55:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ANDON=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3e679f5..bd4493f 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 @@ -124,7 +124,7 @@ public class AndonEnumUtil { /** * 按灯动作标志 - * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼 + * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_FLAG{ From 1adcd23c6faf59425f6c905658dd1aa4e3b436cc Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 31 May 2019 13:00:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) 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 bd4493f..706378e 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 @@ -293,4 +293,31 @@ public class AndonEnumUtil { return description; } } + + /** + * 按灯通知方式 + * 10-短信，20-邮箱 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_WAYS{ + + SMS("10","短信"), + EMAIL("20","邮箱"); + + private String value; + private String description; + + NOTICE_WAYS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From 7ef2eb0c6eb9bbe0ca3ac85ad24488480be4636a Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 31 May 2019 14:12:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=89=93=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockReportEnumUtil.java | 79 ---------------------- 1 file changed, 79 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 5e56bd1..6a9c5f6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -14,85 +14,6 @@ import java.util.List; **/ public class BlockReportEnumUtil { - /** - * 软件类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SOFT_TYPE { - CORE(2, "i3core", "i3业务平台"); - - private int value; - private String code; - private String description; - - private SOFT_TYPE(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].value; - } - } - 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; - } - - public static SOFT_TYPE valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } /** * 报表元素枚举