diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index 374abd7..823a810 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -33,7 +34,7 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "PUSH_NAME") private String pushName; - @ApiParam("规则类型") + @ApiParam("规则表达式") @Column(name = "QUARTZ_CRON") private String quartzCron; @@ -61,10 +62,12 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_NO") private String scriptNo; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE") private String titleTemplate; + @Lob @ApiParam("消息体模板") @Column(name = "CONTENT_TEMPLATE") private String contentTemplate; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index 6a57625..e10dca9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -29,24 +30,23 @@ import javax.persistence.Table; public class WmsPushLog extends BaseBean{ private static final long serialVersionUID = -1708833666516164845L; - @Column(name = "EXE_HQL") - @ApiParam("执行Hql") - private String exeHql; @Column(name = "PUSH_TITLE") @ApiParam("推送标题") private String pushTitle; + @Lob @Column(name = "PUSH_CONTENT") @ApiParam("推送内容") private String pushContent; @Column(name = "PUSH_TYPE") @ApiParam("推送类型") - private String pushType; + private Integer pushType; + + @Column(name = "PATH_URL") + @ApiParam("推送地址") + private String pathUrl; - @Column(name = "PUSH_RESULT") - @ApiParam("推送结果") - private String pushResult; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java index 6667a49..7c2fd7c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -2,14 +2,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import lombok.Data; +import java.util.List; import java.util.Map; @Data public class MailMessageModel extends PushMessageModel { - - //附加,value 文件的绝对地址/动态模板数据 - private Map attachment; - + //推送数据 + List dataList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 1e2ff26..66d8f9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -20,6 +20,8 @@ public class PushMessageModel { //推送地址 public String pathUrl; - //推送数据 - List> dataList; + //工厂代码 + private String organizeCode; + + }