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 3e6bdbe..7fd4de1 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 @@ -367,8 +367,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_MESSAGE_STATUS{ - READ(1,"已读","已读"), - UNREAD(2,"未读","未读"); + READ(1,"已读","fa cell-fa fa-file-text"), + UNREAD(2,"未读","fa cell-fa fa-file-o"); private int value; private String name; @@ -434,8 +434,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_MESSAGE_TYPE{ - NOTICE(1,"已读","已读"), - STATION_LETTER(2,"未读","未读"); + NOTICE(1,"通知","通知"), + STATION_LETTER(2,"站内信","站内信"); private int value; private String name; 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 83472eb..191cc5f 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 @@ -34,24 +34,46 @@ public class SysMessage extends BaseBean { @ApiParam(value ="消息标题" , access ="消息标题") private String messageTitle; - @Column(name="MESSAGE_TYPE_ID") + @Column(name="MESSAGE_TYPE") @ApiParam(value ="消息类型(1.通知,2.站内信)" , example ="1" , access ="消息类型(1.通知,2.站内信)") - private Integer messageTypeId; - - @Column(name="RED_MESSAGE_TYPE_NAME") - @ApiParam(value ="消息类型名称" , access ="消息类型名称") - private String redMessageTypeName; - + private Integer messageType; + @Column(name="MESSAGE_SEND_ID") - @ApiParam(value ="发送者" , example = "0") + @ApiParam(value ="发送者id" , example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long messageSendId; - - @Column(name="MESSAGE_ACCEPT_ID") - @ApiParam(value ="接收者" , example = "0") + + public Long getMessageSendId() { + if(messageSendId != null) { + return messageSendId.longValue(); + }else{ + return messageSendId; + } + } + + @Column(name="RED_SEND_NAME") + @ApiParam(value ="发送者名称" ) @JsonSerialize(using = ToStringSerializer.class) - private Long messageAcceptId; + private String redSendName; + @Column(name="MESSAGE_RECIPIENT_ID") + @ApiParam(value ="接收者id" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private Long messageRecipientId; + + public Long getMessageRecipientId() { + if(messageRecipientId != null) { + return messageRecipientId.longValue(); + }else{ + return messageRecipientId; + } + } + + @Column(name="RED_MESSAGE_RECIPIENT_NAME") + @ApiParam(value ="接收者名称" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private String redMessageRecipientName; + @Column(name="MESSAGE_CONTENT") @ApiParam(value ="消息内容" , access ="消息内容") private String messageContent;