Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -4829,4 +4829,39 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 推送类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PUSH_TYPE {
+        EMAIL(10, "邮件"), SMS(20, "短信");
+
+        private int value;
+        private String description;
+
+        PUSH_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.List;
 
 /**

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java

@@ -0,0 +1,92 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 推送信息配置
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2020-01-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PUSH_CONFIG")
+@Api("推送配置")
+public class WmsPushConfig extends BaseBean{
+
+    private static final long serialVersionUID = 2701710669030092153L;
+    @ApiParam("推送名称")
+    @Column(name = "PUSH_NAME")
+    private String pushName;
+
+    @ApiParam("规则类型")
+    @Column(name = "QUARTZ_CRON")
+    private String quartzCron;
+
+    @ApiParam("末次执行时间")
+    @Column(name = "LAST_EXE_TIME")
+    private String lastExeTime;
+
+    @ApiParam("下次执行时间")
+    @Column(name = "NEXT_EXE_TIME")
+    private String nextExeTime;
+
+    @ApiParam("序号")
+    @Column(name = "SERIAL_NUMBER")
+    private Integer serialNumber;
+
+    @ApiParam("查询Hql")
+    @Column(name = "HQL_STR")
+    private String hqlStr;
+
+    @ApiParam("查询Sql")
+    @Column(name = "SQL_STR")
+    private String sqlStr;
+
+    @ApiParam("脚本编号")
+    @Column(name = "SCRIPT_NO")
+    private String scriptNo;
+
+    @ApiParam("标题模板")
+    @Column(name = "TITLE_TEMPLATE")
+    private String titleTemplate;
+
+    @ApiParam("消息体模板")
+    @Column(name = "CONTENT_TEMPLATE")
+    private String contentTemplate;
+
+    @ApiParam("推送类型")
+    @Column(name = "PUSH_TYPE")
+    private Integer pushType;
+
+    @ApiParam("描述")
+    @Column(name = "REMARK")
+    private String remark;
+
+    @ApiParam("推送地址")
+    @Column(name ="PATH_URL")
+    private String pathUrl;
+
+    @ApiParam("头标签")
+    @Column(name = "TITLE_LABEL")
+    private String titleLabel;
+
+    @ApiParam("内容标签")
+    @Column(name = "CONTENT_LABEL")
+    private String contentLabel;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 推送信息配置
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2020-01-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PUSH_LOG")
+@Api("推送日志")
+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;
+
+    @Column(name = "PUSH_CONTENT")
+    @ApiParam("推送内容")
+    private String pushContent;
+
+    @Column(name = "PUSH_TYPE")
+    @ApiParam("推送类型")
+    private String pushType;
+
+    @Column(name = "PUSH_RESULT")
+    @ApiParam("推送结果")
+    private String pushResult;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class MailMessageModel extends PushMessageModel {
+
+
+    //附加，value 文件的绝对地址/动态模板数据
+    private Map<String, Object> attachment;
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class PushMessageModel {
+
+
+    //标题
+    public String title;
+    //内容
+    public String content;
+
+    //推送类型
+    public String pushType;
+
+    //推送地址
+    public String pathUrl;
+
+    //推送数据
+    List<Map<Object,Object>> dataList;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPushConfig;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :  推送日志配置信息
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2020-01-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsPushConfigRepository extends BaseRepository<WmsPushConfig, Long> {
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :  推送日志保存对象
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2020-01-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsPushLogRepository extends BaseRepository<WmsPushLog, Long> {
+
+}