From 851067b8d209607e8cd71f34d444bd5f8141eea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Jan 2020 16:37:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2020-01-16=2016:37=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=88=97=E8=A1=A8=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/WmsEnumUtil.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b3eb04f..246b2d1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4920,4 +4920,36 @@ public class WmsEnumUtil { } } + /** + * 自定义列表：优先级 (CUSTOMIZE_PROP) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CUSTOMIZE_PROP { + URGENT(1, "默认"), NORMAL(2, "自定义"); + private int value; + private String description; + + CUSTOMIZE_PROP(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; + } + } } \ No newline at end of file From 964afe73cdf5abbd28c4e5b688a5a60d706a9e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Jan 2020 16:43:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2020-01-16=2016:42=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 246b2d1..3ab2b89 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4925,7 +4925,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CUSTOMIZE_PROP { - URGENT(1, "默认"), NORMAL(2, "自定义"); + DEFAULT(1, "默认"), CUSTOMIZE(2, "自定义"); private int value; private String description; From 32d715a29cb5828bc634fd1eead3f5b2ea6245ec Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 16 Jan 2020 17:30:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?APS=20=E8=B0=83=E7=94=A8=E5=A4=B1=E8=B4=A5b?= =?UTF-8?q?ug=20=E4=BF=AE=E5=A4=8D=20=E5=8A=A8=E6=80=81=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=20=E4=B8=8B=E6=8B=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1f12228..9f3237c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -38,7 +38,7 @@ public class CommonEnumUtil { HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), LAC(26, 8600, 13, "lac", "连接适配器"), ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8400, 15, "APS", "高级计划与排程"), + APS(28, 8400, 15, "i3aps", "高级计划与排程"), CENTER(99, 8000, 1, "icloud-server", "注册中心"), SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), diff --git a/pom.xml b/pom.xml index a7b24f3..e1f3573 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ modules/i3plus-pojo-mes-pcn modules/i3plus-pojo-sweb modules/i3plus-pojo-andon + modules/i3plus-pojo-aps modules/i3plus-pojo-lac modules/i3plus-pojo-ptl modules/i3plus-pojo-ptl-pcn