diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java index d402e0675..96b8cdf13 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java @@ -846,7 +846,7 @@ public final class BpmnJsonConverterUtil { getSignConfig(bpmnModel.getMainProcess()); BpmnJsonModel bpmnJsonModel = convertToJson(bpmnModel); - FlowElement flowElement = bpmnModel.getFlowElement("node_865016003134_707l"); + FlowElement flowElement = bpmnModel.getFlowElement("node_865038288523_ff8k"); Optional initiatorSpecifyRange = getInitiatorSpecifyRange(flowElement); Optional initiatorSpecifiedFilter = getInitiatorSpecifiedFilter(flowElement); Optional> excludeIdentityTypes = getExcludeIdentityTypes(flowElement); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java index ce7016f1b..f6b939e40 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnMetaParserHelper.java @@ -143,7 +143,7 @@ public final class BpmnMetaParserHelper { } public static Optional getCategoryVersion(Process process) { - if(Objects.isNull(process)) { + if (Objects.isNull(process)) { return Optional.of(0); } String categoryVersion = process.getAttributeValue(null, FLOW_CATEGORY_VERSION); @@ -471,11 +471,11 @@ public final class BpmnMetaParserHelper { } public static Optional getApproverSpecify(FlowElement flowElement) { - if (Objects.nonNull(flowElement) ){ - if(flowElement instanceof UserTask) { + if (Objects.nonNull(flowElement)) { + if (flowElement instanceof UserTask) { return getApproverSpecify((UserTask) flowElement); - } else if(flowElement instanceof ServiceTask) { + } else if (flowElement instanceof ServiceTask) { return getApproverSpecify((ServiceTask) flowElement); } } @@ -486,24 +486,14 @@ public final class BpmnMetaParserHelper { return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).map(element -> ApproverSpecifyEnum.valueOf(element.getAttributeValue(null, ELEMENT_ATTRIBUTE_VALUE))); } - public static Optional getApproverSpecify(ServiceTask serviceTask) { + public static Optional getApproverSpecify(ServiceTask serviceTask) { return defaultValid(serviceTask, CONFIG_APPROVER_SPECIFY).map(element -> ApproverSpecifyEnum.valueOf(element.getAttributeValue(null, ELEMENT_ATTRIBUTE_VALUE))); } - - - public static Optional getApproverSpecifyRange(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getApproverSpecifyRange((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional getApproverSpecifyRange(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent()) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).map(element -> ApproverSpecifyRangeEnum.valueOf(element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).map(element -> ApproverSpecifyRangeEnum.valueOf(element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_RANGE, Collections.emptyList()) .get(0).getAttributeValue(null, ELEMENT_ATTRIBUTE_VALUE))); } @@ -511,16 +501,9 @@ public final class BpmnMetaParserHelper { } public static Optional getApproverSpecifyRangeOrgLimit(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getApproverSpecifyRangeOrgLimit((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional getApproverSpecifyRangeOrgLimit(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent()) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_RANGE_ORG_LIMIT, Collections.emptyList()) .stream() .findFirst() @@ -530,16 +513,9 @@ public final class BpmnMetaParserHelper { } public static Optional getCooperateShipType(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getCooperateShipType((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional getCooperateShipType(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent()) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_COOPERATE_TYPE, Collections.emptyList()) .stream() .findFirst() @@ -549,16 +525,9 @@ public final class BpmnMetaParserHelper { } public static Optional getApproverSpecifyRangeUnit(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getApproverSpecifyRangeUnit((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional getApproverSpecifyRangeUnit(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent()) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_APPROVE_SPECIFY_RANGE_UNIT, Collections.emptyList()) .stream() .findFirst() @@ -568,16 +537,9 @@ public final class BpmnMetaParserHelper { } public static Optional getInitiatorSpecifyRange(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getInitiatorSpecifyRange((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional getInitiatorSpecifyRange(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.initiatorSpecified_v2)) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_INITIATOR_SPECIFIED_RANGE, Collections.emptyList()) .stream() .findFirst() @@ -587,16 +549,9 @@ public final class BpmnMetaParserHelper { } public static Optional getInitiatorSpecifiedFilter(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getInitiatorSpecifiedFilter(((UserTask) flowElement)); - } - return Optional.empty(); - } - - public static Optional getInitiatorSpecifiedFilter(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.initiatorSpecified_v2)) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_INITIATOR_SPECIFIED_FILTER, Collections.emptyList()) .stream() .findFirst() @@ -606,16 +561,9 @@ public final class BpmnMetaParserHelper { } public static Optional> getExcludeIdentityTypes(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getExcludeIdentityTypes((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional> getExcludeIdentityTypes(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.initiatorSpecified_v2)) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_INITIATOR_SPECIFIED_EXCLUDE_IDENTITY_TYPES, Collections.emptyList()) .stream() .findFirst() @@ -625,16 +573,9 @@ public final class BpmnMetaParserHelper { } public static Optional> getExcludeCooperateShipTypes(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getExcludeIdentityTypes((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional> getExcludeCooperateShipTypes(UserTask userTask) { - Optional approverSpecify = getApproverSpecify(userTask); + Optional approverSpecify = getApproverSpecify(flowElement); if (approverSpecify.isPresent() && Objects.equals(approverSpecify.get(), ApproverSpecifyEnum.initiatorSpecified_v2)) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).flatMap(element -> element.getChildElements() .getOrDefault(CONFIG_INITIATOR_SPECIFIED_EXCLUDE_COOPERATE_TYPES, Collections.emptyList()) .stream() .findFirst() @@ -656,14 +597,7 @@ public final class BpmnMetaParserHelper { } public static Optional getApproverSpecifyValueV2(FlowElement flowElement) { - if (Objects.nonNull(flowElement) && flowElement instanceof UserTask) { - return getApproverSpecifyValueV2((UserTask) flowElement); - } - return Optional.empty(); - } - - public static Optional getApproverSpecifyValueV2(UserTask userTask) { - return defaultValid(userTask, CONFIG_APPROVER_SPECIFY).map(element -> element.getChildElements().getOrDefault(TEMPLATE_UPGRADE_APPROVAL_SPECIFY_VALUE, Collections.emptyList()).get(0).getElementText()); + return defaultValid(flowElement, CONFIG_APPROVER_SPECIFY).map(element -> element.getChildElements().getOrDefault(TEMPLATE_UPGRADE_APPROVAL_SPECIFY_VALUE, Collections.emptyList()).get(0).getElementText()); } public static Optional getApproverEmptyHandleType(FlowElement flowElement) { @@ -693,11 +627,11 @@ public final class BpmnMetaParserHelper { && Objects.equals(specifyEnum, ApproverSpecifyEnum.initiatorSpecified); } - public static Boolean getAreaFilterEnable(FlowElement flowElement){ + public static Boolean getAreaFilterEnable(FlowElement flowElement) { return defaultValid(flowElement, CONFIG_AREA_FILTER_ENABLE).map(element -> Boolean.valueOf(element.getAttributeValue(null, ELEMENT_ATTRIBUTE_CHECKED))).orElse(false); } - public static Boolean getSpecialtyFilterEnable(FlowElement flowElement){ + public static Boolean getSpecialtyFilterEnable(FlowElement flowElement) { return defaultValid(flowElement, CONFIG_SPECIALTY_FILTER_ENABLE).map(element -> Boolean.valueOf(element.getAttributeValue(null, ELEMENT_ATTRIBUTE_CHECKED))).orElse(false); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java index 9a51a35ff..7365ac3b4 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityV2TaskAssigneeSelector.java @@ -17,7 +17,6 @@ import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.flowable.bpmn.model.FlowElement; -import org.flowable.bpmn.model.UserTask; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.stereotype.Component; @@ -124,7 +123,7 @@ public class BasedIdentityV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne } public Set getApproverSpecifyValue(FlowElement flowElement) { - return getApproverSpecifyValueV2((UserTask) flowElement) + return getApproverSpecifyValueV2(flowElement) .map(value -> JSON.parseArray(value, String.class).stream().map(JSON::parseObject) .map(i -> i.getString("value")) .map(FlowTaskAssignerIdentityEnum::valueOf) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java index 4c3a9f846..c316d4ad7 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionV2TaskAssigneeSelector.java @@ -18,7 +18,6 @@ import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.flowable.bpmn.model.FlowElement; -import org.flowable.bpmn.model.UserTask; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.stereotype.Component; @@ -147,7 +146,7 @@ public class BasedPositionV2TaskAssigneeSelector extends AbstractBpmnTaskAssigne } public Set getApproverSpecifyValue(FlowElement flowElement) { - return getApproverSpecifyValueV2((UserTask) flowElement) + return getApproverSpecifyValueV2(flowElement) .map(value -> JSON.parseArray(value, String.class).stream().map(JSON::parseObject) .map(i -> i.getString("value")) .collect(Collectors.toSet())) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java index 7f184e571..8cf007cd3 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleV2TaskAssigneeSelector.java @@ -18,7 +18,6 @@ import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.flowable.bpmn.model.FlowElement; -import org.flowable.bpmn.model.UserTask; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.stereotype.Component; @@ -146,7 +145,7 @@ public class BasedRoleV2TaskAssigneeSelector extends AbstractBpmnTaskAssigneeSel } public Set getApproverSpecifyValue(FlowElement flowElement) { - return getApproverSpecifyValueV2((UserTask) flowElement) + return getApproverSpecifyValueV2(flowElement) .map(value -> JSON.parseArray(value, String.class).stream().map(JSON::parseObject) .map(i -> i.getString("value")) .map(Long::valueOf) diff --git a/workflow-engine-server/src/main/resources/convertorXML.bpmn b/workflow-engine-server/src/main/resources/convertorXML.bpmn index 611c936bb..860a323cd 100644 --- a/workflow-engine-server/src/main/resources/convertorXML.bpmn +++ b/workflow-engine-server/src/main/resources/convertorXML.bpmn @@ -89,7 +89,7 @@ - @@ -181,7 +181,7 @@ ${nrOfInstances != nrOfActiveInstances} - @@ -200,7 +200,7 @@ - @@ -293,9 +293,9 @@ ${nrOfInstances != nrOfActiveInstances} - - @@ -318,36 +318,36 @@ - + - - - - - - - - - - - - - + - + + + + + + + + + + + + +