From 215ffc080b0c2f10787f59a3a397f837f5f7d988 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 2 Jun 2020 13:52:01 +0800 Subject: [PATCH] ptl --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 77 ++++++++++++++++++++++ .../pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 16 +++-- .../i3plus/pojo/ptl/model/CommonMsgModel.java | 7 +- 4 files changed, 94 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index c2732ee..58d22b3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -19,7 +19,7 @@ public class AndonEnumUtil { public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { INNER(10, "内部处理"), OUTER(20, "外部处理"), - REVIEW(30, "人工审核"); + REVIEW(30, "人工确认"); private int value; private String description; 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 8791cb5..679e650 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 @@ -14,6 +14,83 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_ public class PtlPcnEnumUtil { /** + * 状态机异常处理方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { + INNER(10, "内部处理"), + OUTER(20, "外部处理"), + REVIEW(30, "人工确认"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { + TRUE(10, "已处理"), + FALSE(20, "未处理"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常缓存标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG { + FALSE(10, "否"), + TRUE(20, "是"), + ORIGINAL(30, "原先"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 控制器状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index ec94e86..1795f20 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -56,9 +55,16 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable @ApiParam(value = "缓存标识") private Integer cacheFlag; - @Lob - @Column(name = "CONTENT") - @ApiParam(value = "内容") - private String content; + @Column(name = "CACHE_KEY") + @ApiParam(value = "缓存KEY") + private String cacheKey; + + @Column(name = "HANDLE_TYPE") + @ApiParam(value = "处理方式") + private Integer handleType; + + @Column(name = "HANDLE_STATUS") + @ApiParam(value = "处理状态") + private Integer handleStatus; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index c079dc1..249a802 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -48,7 +48,10 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("外部触发事件") private String triggerEvent; - @ApiModelProperty("流程类型") - private Integer routeType; + @ApiModelProperty("缓存KEY") + private String cacheKey; + + @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") + private boolean errorInnerAction = false; }