From 7dbca966f3aa8316a7a66de9acfe279154ad05ca Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 2 Sep 2025 09:59:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-4418)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/common/enums/ApprovalMethodEnum.java | 8 +------- .../common/enums/ApproverEmptyHandleTypeEnum.java | 8 +------- .../axzo/workflow/common/enums/ApproverScopeEnum.java | 8 +------- .../workflow/common/enums/ApproverSpecifyEnum.java | 8 +------- .../common/enums/ApproverSpecifyRangeEnum.java | 8 +------- .../common/enums/ApproverSpecifyRangeUnitEnum.java | 8 +------- .../workflow/common/enums/AttachmentTypeEnum.java | 8 +------- .../workflow/common/enums/AutoApprovalTypeEnum.java | 11 +---------- .../cn/axzo/workflow/common/enums/BpmnButtonEnum.java | 8 +------- .../common/enums/BpmnCountersignTypeEnum.java | 8 +------- .../axzo/workflow/common/enums/BpmnFlowNodeMode.java | 8 +------- .../axzo/workflow/common/enums/BpmnFlowNodeType.java | 8 +------- .../cn/axzo/workflow/common/enums/BpmnNoticeEnum.java | 8 +------- .../common/enums/BpmnProcessInstanceResultEnum.java | 8 +------- .../common/enums/BpmnProcessTaskResultEnum.java | 8 +------- .../axzo/workflow/common/enums/BpmnReminderType.java | 8 +------- .../cn/axzo/workflow/common/enums/BpmnSignType.java | 9 +-------- .../workflow/common/enums/ButtonVisibleScopeEnum.java | 8 +------- .../workflow/common/enums/CarbonCopyObjectType.java | 9 +-------- .../common/enums/InitiatorSpecifiedRangeEnum.java | 8 +------- .../axzo/workflow/common/enums/ModelBizTypeEnum.java | 8 +------- .../common/enums/SignApproverOrgLimitEnum.java | 8 +------- .../common/enums/SignApproverRoleLimitEnum.java | 8 +------- .../cn/axzo/workflow/common/enums/WorkspaceType.java | 4 +--- 24 files changed, 24 insertions(+), 169 deletions(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApprovalMethodEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApprovalMethodEnum.java index e8417e769..d5539405d 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApprovalMethodEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApprovalMethodEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -37,18 +36,13 @@ public enum ApprovalMethodEnum { this.remark = remark; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ApprovalMethodEnum fromValue(String value) { if (value == null) { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverEmptyHandleTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverEmptyHandleTypeEnum.java index 39e963eca..bdc2e9e1e 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverEmptyHandleTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverEmptyHandleTypeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -31,18 +30,13 @@ public enum ApproverEmptyHandleTypeEnum { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ApproverEmptyHandleTypeEnum fromValue(String value) { if (value == null) { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverScopeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverScopeEnum.java index a771c06c4..159831ac0 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverScopeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverScopeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -34,18 +33,13 @@ public enum ApproverScopeEnum { this.processor = processor; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ApprovalMethodEnum fromValue(String value) { if (value == null) { return ApprovalMethodEnum.unknown; } return Arrays.stream(ApprovalMethodEnum.values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(ApprovalMethodEnum.unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java index 98bdfd170..c7f12ce4c 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -50,18 +49,13 @@ public enum ApproverSpecifyEnum { this.version = version; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ApproverSpecifyEnum fromValue(String value) { if (value == null) { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeEnum.java index ca917013b..53d634a75 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -33,18 +32,13 @@ public enum ApproverSpecifyRangeEnum { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ApproverSpecifyRangeEnum fromValue(String value) { if (value == null) { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeUnitEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeUnitEnum.java index cd0ec65a4..281a749ae 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeUnitEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyRangeUnitEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -34,18 +33,13 @@ public enum ApproverSpecifyRangeUnitEnum { this.value = value; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ApproverSpecifyRangeUnitEnum fromValue(String value) { if (value == null) { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AttachmentTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AttachmentTypeEnum.java index e8f174397..e09e24a79 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AttachmentTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AttachmentTypeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -31,18 +30,13 @@ public enum AttachmentTypeEnum { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static AttachmentTypeEnum fromValue(String value) { if (value == null) { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AutoApprovalTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AutoApprovalTypeEnum.java index 31708c7dd..dd764f2e1 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AutoApprovalTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AutoApprovalTypeEnum.java @@ -3,7 +3,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; import lombok.Getter; -import org.springframework.util.StringUtils; import java.util.Arrays; @@ -29,15 +28,7 @@ public enum AutoApprovalTypeEnum { } public static AutoApprovalTypeEnum fromType(String type) { - if (!StringUtils.hasText(type)) { - return null; - } - for (AutoApprovalTypeEnum typeEnum : AutoApprovalTypeEnum.values()) { - if (typeEnum.type.equals(type)) { - return typeEnum; - } - } - return null; + return fromValue(type); } @JsonCreator(mode = JsonCreator.Mode.DELEGATING) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnButtonEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnButtonEnum.java index 1f36a883b..9ce2bd15f 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnButtonEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnButtonEnum.java @@ -3,7 +3,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.Lists; import lombok.Getter; @@ -80,11 +79,6 @@ public enum BpmnButtonEnum { UNKNOWN(99, "UNKNOWN", "未知", Lists.newArrayList()), ; - @JsonValue - public String getBtnKey() { - return btnKey; - } - private final int order; private final String btnKey; private final String btnName; @@ -104,7 +98,7 @@ public enum BpmnButtonEnum { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getBtnKey().equalsIgnoreCase(value)) + .filter(e -> e.getBtnKey().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnCountersignTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnCountersignTypeEnum.java index f17c84e8d..5566672a3 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnCountersignTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnCountersignTypeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import org.apache.commons.lang3.StringUtils; @@ -42,11 +41,6 @@ public enum BpmnCountersignTypeEnum { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - public static BpmnCountersignTypeEnum valueOfType(String countersignType) { if (StringUtils.isBlank(countersignType)) { return null; @@ -66,7 +60,7 @@ public enum BpmnCountersignTypeEnum { return UNKNOW; } return Arrays.stream(values()) - .filter(v -> v.getType().equalsIgnoreCase(value)) + .filter(v -> v.getType().equalsIgnoreCase(value) || v.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOW); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeMode.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeMode.java index 6f897221d..8684c34a5 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeMode.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeMode.java @@ -3,7 +3,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -26,11 +25,6 @@ public enum BpmnFlowNodeMode { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - public static BpmnFlowNodeMode valueOfType(String type) { return fromValue(type); } @@ -41,7 +35,7 @@ public enum BpmnFlowNodeMode { return UNKNOWN; } return Arrays.stream(BpmnFlowNodeMode.values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java index ac4edeb35..5b19c7bca 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java @@ -3,7 +3,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import org.springframework.util.StringUtils; @@ -40,11 +39,6 @@ public enum BpmnFlowNodeType { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - public static BpmnFlowNodeType getByType(String type) { return fromValue(type); } @@ -59,7 +53,7 @@ public enum BpmnFlowNodeType { return UNKNOWN; } return Arrays.stream(BpmnFlowNodeType.values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnNoticeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnNoticeEnum.java index 98187444c..168187288 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnNoticeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnNoticeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -36,18 +35,13 @@ public enum BpmnNoticeEnum { this.desc = desc; } - @JsonValue - public String getKey() { - return key; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static BpmnNoticeEnum fromValue(String key) { if (key == null) { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getKey().equalsIgnoreCase(key)) + .filter(e -> e.getKey().equalsIgnoreCase(key) || e.name().equalsIgnoreCase(key)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessInstanceResultEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessInstanceResultEnum.java index 7058eae57..4ae46cef7 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessInstanceResultEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessInstanceResultEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -37,11 +36,6 @@ public enum BpmnProcessInstanceResultEnum { this.desc = desc; } - @JsonValue - public String getStatus() { - return status; - } - public static BpmnProcessInstanceResultEnum valueOfDesc(String desc) { return Arrays.stream(values()).filter(it -> it.getDesc().equals(desc)).findFirst().orElse(DELETED); } @@ -57,7 +51,7 @@ public enum BpmnProcessInstanceResultEnum { return UNKNOWN; } return Arrays.stream(BpmnProcessInstanceResultEnum.values()) - .filter(e -> e.getStatus().equalsIgnoreCase(value)) + .filter(e -> e.getStatus().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessTaskResultEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessTaskResultEnum.java index 98e88c547..5d21526f0 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessTaskResultEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnProcessTaskResultEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -33,18 +32,13 @@ public enum BpmnProcessTaskResultEnum { this.desc = desc; } - @JsonValue - public String getStatus() { - return status; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static BpmnProcessTaskResultEnum fromValue(String status) { if (status == null) { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getStatus().equalsIgnoreCase(status)) + .filter(e -> e.getStatus().equalsIgnoreCase(status) || e.name().equalsIgnoreCase(status)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnReminderType.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnReminderType.java index f4b3c2795..e6aa1e54e 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnReminderType.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnReminderType.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -34,18 +33,13 @@ public enum BpmnReminderType { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static BpmnReminderType fromValue(String value) { if (value == null) { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnSignType.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnSignType.java index 340f8d2d0..54eec84f2 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnSignType.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnSignType.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -30,12 +29,6 @@ public enum BpmnSignType { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - - public static BpmnSignType valueOfType(String type) { return fromValue(type); } @@ -46,7 +39,7 @@ public enum BpmnSignType { return UNKNOWN; } return Arrays.stream(BpmnSignType.values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ButtonVisibleScopeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ButtonVisibleScopeEnum.java index ac824fbc1..aa753b2a9 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ButtonVisibleScopeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ButtonVisibleScopeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -29,18 +28,13 @@ public enum ButtonVisibleScopeEnum { this.desc = desc; } - @JsonValue - public String getStatus() { - return status; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ButtonVisibleScopeEnum fromValue(String value) { if (value == null) { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getStatus().equalsIgnoreCase(value)) + .filter(e -> e.getStatus().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/CarbonCopyObjectType.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/CarbonCopyObjectType.java index 9138ded5e..e58b49078 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/CarbonCopyObjectType.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/CarbonCopyObjectType.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -54,12 +53,6 @@ public enum CarbonCopyObjectType { this.processor = processor; } - @JsonValue - public String getType() { - return type; - } - - public static CarbonCopyObjectType valueOfType(String type) { return fromValue(type); } @@ -70,7 +63,7 @@ public enum CarbonCopyObjectType { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/InitiatorSpecifiedRangeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/InitiatorSpecifiedRangeEnum.java index 4b497726b..85fa12371 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/InitiatorSpecifiedRangeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/InitiatorSpecifiedRangeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -30,18 +29,13 @@ public enum InitiatorSpecifiedRangeEnum { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static InitiatorSpecifiedRangeEnum fromValue(String value) { if (value == null) { return unknown; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(unknown); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ModelBizTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ModelBizTypeEnum.java index c959d6d7b..21567656a 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ModelBizTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ModelBizTypeEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -29,11 +28,6 @@ public enum ModelBizTypeEnum { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - public static ModelBizTypeEnum valueOfType(String type) { return fromValue(type); } @@ -44,7 +38,7 @@ public enum ModelBizTypeEnum { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverOrgLimitEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverOrgLimitEnum.java index cca2b12d9..ea6d6f567 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverOrgLimitEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverOrgLimitEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -36,11 +35,6 @@ public enum SignApproverOrgLimitEnum { this.code = code; } - @JsonValue - public String getType() { - return type; - } - public static SignApproverOrgLimitEnum valueOfType(String type) { return fromValue(type); } @@ -51,7 +45,7 @@ public enum SignApproverOrgLimitEnum { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverRoleLimitEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverRoleLimitEnum.java index a6ed1251e..996b2e136 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverRoleLimitEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/SignApproverRoleLimitEnum.java @@ -2,7 +2,6 @@ package cn.axzo.workflow.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonEnumDefaultValue; -import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; import java.util.Arrays; @@ -28,11 +27,6 @@ public enum SignApproverRoleLimitEnum { this.desc = desc; } - @JsonValue - public String getType() { - return type; - } - public static SignApproverRoleLimitEnum valueOfType(String type) { return Arrays.stream(SignApproverRoleLimitEnum.values()) .filter(i -> Objects.equals(i.getType(), type)) @@ -46,7 +40,7 @@ public enum SignApproverRoleLimitEnum { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/WorkspaceType.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/WorkspaceType.java index b7a719b6d..99d3c414e 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/WorkspaceType.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/WorkspaceType.java @@ -34,9 +34,7 @@ public enum WorkspaceType { } public static WorkspaceType getType(Integer code) { - return Arrays.stream(values()).filter(it -> it.getCode().equals(code)) - .findFirst() - .orElse(null); + return fromValue(String.valueOf(code)); } @JsonCreator(mode = JsonCreator.Mode.DELEGATING)