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 017b3c5..1892d1e 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 @@ -1476,6 +1476,7 @@ public class ImppEnumUtil { /** * 短信供应商 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_SUPPLIER { ALI_CLOUD(1, "阿里云"); @@ -1523,10 +1524,11 @@ public class ImppEnumUtil { /** * 短信模板状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_TEMPLATE_STATUS { - VER_CODE(10, "审核中"), - NOTICE_SMS(20, "审核通过"), - PROMOTE_SMS(30, "审核失败"); + UNDER_REVIEW(10, "审核中"), + PASS(20, "审核通过"), + FAIL(30, "审核失败"); private int value; private String description; @@ -1561,6 +1563,7 @@ public class ImppEnumUtil { /** * 短信模板类型 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_TEMPLATE_TYPE { VER_CODE(10, "验证码"), NOTICE_SMS(20, "短信通知"), @@ -1600,6 +1603,7 @@ public class ImppEnumUtil { /** * 短信发送状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SMS_SEND_STATUS { WAIT_RECEIPT(10, "等待回执"), FAIL(20, "发送失败"), diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java index 64f297f..19bbe3f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -47,6 +48,10 @@ public class SysSmsSendRecord extends BaseBean { @ApiModelProperty(value = "软件模块") private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + /** * 接收手机号 */ @@ -104,6 +109,10 @@ public class SysSmsSendRecord extends BaseBean { @ApiModelProperty(value = "短信发送状态") private Integer smsSendStatus; + public String getSmsSendStatusTxt() { + return smsSendStatus == null ? null : ImppEnumUtil.SMS_SEND_STATUS.valueOfDescription(smsSendStatus); + } + /** * 短信发送时间 */ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java index c298f3e..40bf0f3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java @@ -51,12 +51,13 @@ public class SysSmsTemplate extends BaseBean { * 模板代码 */ @Column(name = "SUPPLIER_TEMPLATE_CODE") - @ApiModelProperty(value = "模板代码") + @ApiModelProperty(value = "供应商模板代码") private String supplierTemplateCode; /** * 模板类型 */ + @AnnoOutputColumn @Column(name = "TEMPLATE_TYPE") @ApiModelProperty(value = "模板类型") private Integer templateType; @@ -64,10 +65,15 @@ public class SysSmsTemplate extends BaseBean { /** * 供应商类型 */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SUPPLIER.class) @Column(name = "SUPPLIER_TYPE") @ApiModelProperty(value = "供应商类型") private Integer supplierType; + public String getSupplierTypeTxt() { + return supplierType == null ? null : ImppEnumUtil.SMS_SUPPLIER.valueOfDescription(supplierType); + } + /** * 模板状态 */ @@ -76,6 +82,10 @@ public class SysSmsTemplate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class) private Integer templateStatus; + public String getTemplateStatusTxt() { + return templateStatus == null ? null : ImppEnumUtil.SMS_TEMPLATE_STATUS.valueOfDescription(templateStatus); + } + /** * 模板内容 */ @@ -92,6 +102,13 @@ public class SysSmsTemplate extends BaseBean { /** + * 是否修改模板内容 + */ + @Transient + @ApiModelProperty(value = "是否修改模板内容") + private Integer isModifyContent; + + /** * 审批备注 */ @Transient