feat(REQ-4418) - 调整枚举内容

This commit is contained in:
wangli 2025-09-02 09:59:27 +08:00
parent 89a005469c
commit 7dbca966f3
24 changed files with 24 additions and 169 deletions

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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)

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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)