From 4fe87c5ce263f4676a7895a47a4a3f6ccc3a21c7 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 13 Dec 2018 19:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 36 +++++++++++++++++++++- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 2 +- .../i3plus/pojo/platform/bean/SysMessage.java | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) 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 1a96c35..43a868b 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 @@ -559,7 +559,6 @@ public class CommonEnumUtil { } } - /** * 性别 */ @@ -595,4 +594,39 @@ public class CommonEnumUtil { } } + /** + * 服务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CLOUD_STATUS { + REGISTERED(1, "注册"), + DISCONNECT(2, "断开"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private CLOUD_STATUS(int value, String description) { + this.value = value; + this.description = 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; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index ba15b22..62417e6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -689,7 +689,7 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE_CONTENT { - HTML(1,"HTML","text/plain;charset=UTF-8"), + HTML(1,"HTML","text/html;charset=UTF-8"), TEXT(2,"TEXT","text/plain;charset=UTF-8"); private int value; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index a3d87b2..8b77e3c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -56,7 +56,7 @@ public class SysMessage extends BaseBean { private String messageSenderNameRdd; @Column(name="MESSAGE_RECEIVERS_ID") - @ApiParam(value ="发送者名称" ) + @ApiParam(value ="发送者id" ) private String messageReceiversId; @Column(name="MESSAGE_RECEIVERS_NAME_RDD")