From 1ec56edcdc4536957bc49120e96c8bdb34b0730d Mon Sep 17 00:00:00 2001
From: luweihao <wynne.lu@estsh.com>
Date: Mon, 17 Feb 2020 21:43:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?task=20`1295`=20mes=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java  | 29 ++++++++++++++++++++++
 .../i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java   |  6 ++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
index 109441d..547c005 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
@@ -295,4 +295,33 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum StatusType {
+        START(10, "START", "开始状态"),
+        FINISH(20, "FINISH", "完成状态"),
+        TERMINATE(30, "TERMINATE", "中断状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        StatusType(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java
index ba83441..6ae00b1 100644
--- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java
+++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java
@@ -70,9 +70,9 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
     @ApiParam("离开状态调用")
     private Long outAmgId;
 
-    @Column(name = "SEQ")
-    @ApiParam("流程状态顺序")
-    private Integer seq;
+    @Column(name = "STATUS_TYPE")
+    @ApiParam("状态类型")
+    private Integer statusType;
 
 
 }

From 1a2f00afc3e6281c48d3b22273b32739820b5ce6 Mon Sep 17 00:00:00 2001
From: luweihao <wynne.lu@estsh.com>
Date: Mon, 17 Feb 2020 21:44:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?task=20`1408`=20=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesSyncDeadLetter.java    | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java
new file mode 100644
index 0000000..986ee2c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2020/02/15 1:45 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SYNC_DEAD_LETTER", indexes = {
+        @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"),
+        @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE")
+})
+@Api("数据同步死信")
+public class MesSyncDeadLetter extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1151025992437433734L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "SYNC_TYPE")
+    @ApiParam("同步类型")
+    private Integer syncType;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("pcn代码")
+    private String pcnCode;
+
+    @Lob
+    @Column(name = "DATA")
+    @ApiParam("同步数据")
+    private String data;
+
+
+}