wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-5965' into dev

Browse Source
This commit is contained in:
wangli 2025-11-07 17:24:01 +08:00
commit f117062124
14 changed files with 69 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/SignatureDTO.java
View File

@ -1,6 +1,5 @@
package cn.axzo.workflow.common.model.dto;
import cn.axzo.workflow.common.enums.BpmnProcessTaskResultEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -41,9 +40,11 @@ public class SignatureDTO implements Serializable {
@Accessors(chain = true)
public static class SignDetail implements Serializable {
private static final long serialVersionUID = 1L;
//审批人姓名
private String approverName;
private String signature;
private String advice;
private BpmnProcessTaskResultEnum result;
private String result;
private Date operationTime;
}
}

11
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
View File

@ -164,7 +164,7 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
// 更新流程内的变量
runtimeService.setVariables(task.getProcessInstanceId(), variables);
// 记录电子签名的图片
recordSignature(task, runtimeService);
recordSignature(task, runtimeService, attachmentList, advice, approver);
resetApproverNode(task.getProcessInstanceId());
@ -192,7 +192,11 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
approver.setNodeId(logs.get(0).getAssigneeFull().get(0).getNodeId());
}
private void recordSignature(TaskEntity task, RuntimeService runtimeService) {
public static void recordSignature(TaskEntity task,
RuntimeService runtimeService,
List<AttachmentDTO> attachmentList,
String advice,
BpmnTaskDelegateAssigner approver) {
List<SignatureDTO> signatures = runtimeService.getVariable(task.getProcessInstanceId(), SIGNATURE_COLLECTION, List.class);
if (Objects.isNull(signatures)) {
signatures = new ArrayList<>();
@ -208,9 +212,10 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
.findFirst()
.ifPresent(attachment -> dto.getSignatures().add(0,
new SignatureDTO.SignDetail()
.setApproverName(approver.getAssignerName())
.setSignature(attachment.getUrl())
.setAdvice(advice)
.setResult(BpmnProcessTaskResultEnum.APPROVED)
.setResult(BpmnProcessTaskResultEnum.APPROVED.getDesc())
.setOperationTime(new Date())));
if (!any.isPresent()) {
signatures.add(dto);

35
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java
View File

@ -1,9 +1,7 @@
package cn.axzo.workflow.core.engine.cmd;
import cn.axzo.workflow.common.enums.AttachmentTypeEnum;
import cn.axzo.workflow.common.enums.BpmnFlowNodeType;
import cn.axzo.workflow.common.exception.WorkflowEngineException;
import cn.axzo.workflow.common.model.dto.SignatureDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.AttachmentDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditWithFormDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
@ -14,7 +12,6 @@ import cn.axzo.workflow.core.repository.entity.ExtAxProcessLog;
import cn.axzo.workflow.core.service.ExtAxBpmnFormRelationService;
import cn.axzo.workflow.core.service.ExtAxProcessLogService;
import com.alibaba.fastjson.JSON;
import org.apache.commons.collections4.ListUtils;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.common.engine.impl.interceptor.CommandContext;
import org.flowable.engine.RuntimeService;
@ -34,12 +31,10 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -48,10 +43,10 @@ import static cn.axzo.workflow.common.constant.BpmnConstants.CLOSE_PROCESS_ASSIG
import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_ADVICE;
import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_OPERATION_DESC;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_SPECIFY_NEXT_APPROVER;
import static cn.axzo.workflow.common.constant.BpmnConstants.SIGNATURE_COLLECTION;
import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_COMPLETE_OPERATION_TYPE;
import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_SUBMIT_FORM_VARIABLE;
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.APPROVED;
import static cn.axzo.workflow.core.engine.cmd.CustomApproveTaskCmd.recordSignature;
import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.addComment;
import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.batchAddAttachment;
import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.validTask;
@ -183,7 +178,7 @@ public class CustomApproveTaskWithFormCmd extends AbstractCommand<Void> implemen
// 更新流程实例变量
runtimeService.setVariables(task.getProcessInstanceId(), variables);
// 记录电子签名的图片
recordSignature(task, runtimeService);
recordSignature(task, runtimeService, attachmentList, advice, approver);
resetApproverNode(task.getProcessInstanceId());
@ -262,30 +257,4 @@ public class CustomApproveTaskWithFormCmd extends AbstractCommand<Void> implemen
}
}
private void recordSignature(TaskEntity task, RuntimeService runtimeService) {
List<SignatureDTO> signatures = runtimeService.getVariable(task.getProcessInstanceId(), SIGNATURE_COLLECTION, List.class);
if (Objects.isNull(signatures)) {
signatures = new ArrayList<>();
}
Optional<SignatureDTO> any = signatures.stream()
.filter(i -> Objects.equals(i.getActivityId(), task.getTaskDefinitionKey())).findAny();
SignatureDTO dto = any.orElse(new SignatureDTO()
.setActivityId(task.getTaskDefinitionKey())
.setActivityName(task.getName())
.setSignatures(new ArrayList<>()));
ListUtils.emptyIfNull(attachmentList).stream()
.filter(i -> Objects.equals(i.getType(), AttachmentTypeEnum.signature))
.findFirst()
.ifPresent(attachment -> dto.getSignatures().add(0,
new SignatureDTO.SignDetail()
.setSignature(attachment.getUrl())
.setAdvice(advice)));
if (!any.isPresent()) {
signatures.add(dto);
}
if (!CollectionUtils.isEmpty(signatures)) {
runtimeService.setVariable(task.getProcessInstanceId(), SIGNATURE_COLLECTION, signatures);
}
}
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityCallbackEventListener.java
View File

@ -52,10 +52,9 @@ public class EngineActivityCallbackEventListener extends AbstractFlowableEventLi
}
private List<BpmnActivityEventListener> getOrderedListeners() {
ActivityOperationContext context = new ActivityOperationContext();
List<BpmnActivityEventListener> orderListeners = new ArrayList<>();
activityListeners.ifAvailable(orderListeners::addAll);
orderListeners.forEach(i -> i.setContext(context));
orderListeners.forEach(i -> i.setContext(new ActivityOperationContext()));
return orderListeners;
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityEndEventListener.java
View File

@ -38,10 +38,9 @@ public class EngineActivityEndEventListener implements ExecutionListener {
}
private List<BpmnActivityEventListener> getOrderedListeners() {
ActivityOperationContext context = new ActivityOperationContext();
List<BpmnActivityEventListener> orderListeners = new ArrayList<>();
activityListeners.ifAvailable(orderListeners::addAll);
orderListeners.forEach(i -> i.setContext(context));
orderListeners.forEach(i -> i.setContext(new ActivityOperationContext()));
return orderListeners;
}
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityExtEventListener.java
View File

@ -61,10 +61,9 @@ public class EngineActivityExtEventListener extends AbstractFlowableEventListene
}
private List<BpmnActivityEventListener> getOrderedListeners() {
ActivityOperationContext context = new ActivityOperationContext();
List<BpmnActivityEventListener> orderListeners = new ArrayList<>();
activityListeners.ifAvailable(orderListeners::addAll);
orderListeners.forEach(i -> i.setContext(context));
orderListeners.forEach(i -> i.setContext(new ActivityOperationContext()));
return orderListeners;
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineActivityStartEventListener.java
View File

@ -38,10 +38,9 @@ public class EngineActivityStartEventListener implements ExecutionListener {
}
private List<BpmnActivityEventListener> getOrderedListeners() {
ActivityOperationContext context = new ActivityOperationContext();
List<BpmnActivityEventListener> orderListeners = new ArrayList<>();
activityListeners.ifAvailable(orderListeners::addAll);
orderListeners.forEach(i -> i.setContext(context));
orderListeners.forEach(i -> i.setContext(new ActivityOperationContext()));
return orderListeners;
}
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java
View File

@ -116,10 +116,9 @@ public class EngineNoticeEventListener extends AbstractFlowableEventListener {
}
private List<BpmnMessagePushEventListener> getOrderedListeners() {
NoticeOperationContext context = new NoticeOperationContext();
List<BpmnMessagePushEventListener> orderListeners = new ArrayList<>();
processEventListeners.ifAvailable(orderListeners::addAll);
orderListeners.forEach(i -> i.setContext(context));
orderListeners.forEach(i -> i.setContext(new NoticeOperationContext()));
return orderListeners;
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java
View File

@ -167,10 +167,9 @@ public class EngineProcessInstanceEventListener extends AbstractFlowableEngineEv
}
private List<BpmnProcessEventListener> getOrderedListeners() {
ProcessOperationContext context = new ProcessOperationContext();
List<BpmnProcessEventListener> orderListeners = new ArrayList<>();
processEventListeners.ifAvailable(orderListeners::addAll);
orderListeners.forEach(i -> i.setContext(context));
orderListeners.forEach(i -> i.setContext(new ProcessOperationContext()));
return orderListeners;
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java
View File

@ -77,10 +77,9 @@ public class EngineTaskEventListener implements TaskListener {
* @return
*/
private List<BpmnTaskEventListener> getOrderedListeners() {
TaskOperationContext context = new TaskOperationContext();
List<BpmnTaskEventListener> orderListeners = new ArrayList<>();
taskEventListeners.ifAvailable(orderListeners::addAll);
orderListeners.forEach(i -> i.setContext(context));
orderListeners.forEach(i -> i.setContext(new TaskOperationContext()));
return orderListeners;
}

54
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -157,10 +157,9 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.IntStream;
import static cn.axzo.workflow.client.config.WorkflowRequestInterceptor.HEADER_SERVER_NAME;
import static cn.axzo.workflow.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_CREATE_PARAM_ERROR;
@ -1916,46 +1915,45 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
}
private List<DocBaseVO> getAndAddBizCustomDocs(String processInstanceId, List<DocBaseVO> docs) {
HistoricProcessInstance processInstance = null;
String tenantId;
if (CollectionUtils.isEmpty(docs)) {
processInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
tenantId = Objects.nonNull(processInstance) ? processInstance.getTenantId() : "";
} else {
tenantId = docs.get(0).getTenantId();
}
List<CustomDocDTO> bizCustomDocs = Optional.ofNullable(
runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOCS, List.class))
.orElse(Collections.emptyList());
String customAddType = runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOC_ADD_ORDER_TYPE, String.class);
boolean appendLast = "last".equals(customAddType);
Comparator<DocBaseVO> orderComparator = Comparator.comparing(
DocBaseVO::getOrder, Comparator.nullsFirst(Comparator.naturalOrder()));
Optional<DocBaseVO> baseOpt;
Stream<DocBaseVO> filtered = docs.stream().filter(Objects::nonNull);
if (appendLast) {
baseOpt = filtered.max(orderComparator);
} else {
baseOpt = filtered.min(orderComparator);
}
int baseOrder = baseOpt.map(DocBaseVO::getOrder).orElse(0);
String tenantId = baseOpt.map(DocBaseVO::getTenantId).orElse(Objects.nonNull(processInstance) ? processInstance.getTenantId() : null);
AtomicInteger orderCounter = new AtomicInteger(baseOrder);
int delta = appendLast ? 1 : -1;
List<DocBaseVO> docBaseVOS = BeanMapper.copyList(bizCustomDocs, DocBaseVO.class, (s, t) -> {
// 业务自定义文档
List<DocBaseVO> customBizDocs = BeanMapper.copyList(bizCustomDocs, DocBaseVO.class, (s, t) -> {
t.setStatus(true);
t.setTempFile(false);
t.setTemplateName(s.getFileName());
t.setOrder(orderCounter.addAndGet(delta));
t.setTag(s.getFileTag());
t.setTenantId(tenantId);
t.setFileRelationId(s.getFileKey());
});
if (appendLast) {
docs.addAll(docBaseVOS);
List<String> basedFileTagOrder = runtimeService.getVariable(processInstanceId, SIGN_BIZ_BASED_FILE_TAG_ORDER, List.class);
if (!CollectionUtils.isEmpty(basedFileTagOrder)) {
docs.addAll(customBizDocs);
// 基于 fileTag 排序
Map<String, Integer> fileTagOrderMap = IntStream.range(0, basedFileTagOrder.size())
.boxed()
.collect(Collectors.toMap(basedFileTagOrder::get, i -> i, (a, b) -> a));
docs.sort(Comparator.comparing(d -> fileTagOrderMap.getOrDefault(d.getTag(), Integer.MAX_VALUE)));
docs = docs.stream().sorted(Comparator.comparingInt(d -> fileTagOrderMap.getOrDefault(d.getTag(), Integer.MAX_VALUE)))
.collect(Collectors.toList());
} else {
docs.addAll(0, docBaseVOS);
String customAddType = runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOC_ADD_ORDER_TYPE, String.class);
if ("last".equals(customAddType)) {
docs.addAll(customBizDocs);
} else {
docs.addAll(0, customBizDocs);
}
}
return docs;

19
workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/WpsUtil.java
View File

@ -18,6 +18,7 @@ import cn.axzo.workflow.common.model.dto.UploadFieldDTO;
import cn.axzo.workflow.common.model.dto.VariableObjectDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.engine.cmd.CustomGetProcessInstanceVariablesToObjectCmd;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONException;
import com.google.common.collect.Lists;
@ -113,6 +114,18 @@ public class WpsUtil {
List<SignatureDTO.SignDetail> signDetails = (List<SignatureDTO.SignDetail>) variableObjectDTO.getValue();
if (!CollectionUtils.isEmpty(signDetails)) {
SignatureDTO.SignDetail signDetail = signDetails.get(0);
signatureAndAdvices.add(VariableObjectDTO.builder()
.key(variableObjectDTO.getKey() + "_approverName")
.desc(variableObjectDTO.getDesc() + "姓名")
.value(signDetail.getApproverName())
.type(VariableObjectDTO.Type.text)
.build());
signatureAndAdvices.add(VariableObjectDTO.builder()
.key(variableObjectDTO.getKey() + "_activityResult")
.desc(variableObjectDTO.getDesc() + "审批结果")
.value(signDetail.getResult())
.type(VariableObjectDTO.Type.text)
.build());
ApiSignUrlDownloadRequest request = ApiSignUrlDownloadRequest.builder()
.fileKeys(Lists.newArrayList(signDetail.getSignature())).build();
List<ApiSignUrlDownloadResponse> signUrl = RpcExternalUtil.rpcProcessor(() -> serverFileServiceApi.signUrlFetchDownload(request), "获取手写签图片地址", request);
@ -128,6 +141,12 @@ public class WpsUtil {
.value(signDetail.getAdvice())
.type(VariableObjectDTO.Type.text)
.build());
signatureAndAdvices.add(VariableObjectDTO.builder()
.key(variableObjectDTO.getKey() + "_activityOperationTime")
.desc(variableObjectDTO.getDesc() + "日期")
.value(DateUtil.format(signDetail.getOperationTime(), "yyyy.MM.dd"))
.type(VariableObjectDTO.Type.text)
.build());
}
});
wpsVariables.addAll(signatureAndAdvices);

1
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/FirstCopyTemplateFileTaskEvent_105_Listener.java
View File

@ -125,6 +125,7 @@ public class FirstCopyTemplateFileTaskEvent_105_Listener extends AbstractBpmnEve
}
List<String> basedFileTagOrder = runtimeService.getVariable(processInstanceId, SIGN_BIZ_BASED_FILE_TAG_ORDER, List.class);
if (Objects.nonNull(basedFileTagOrder)) {
docTemplates.addAll(customDocTemplates);
// 基于 fileTag 排序
Map<String, Integer> fileTagOrderMap = IntStream.range(0, basedFileTagOrder.size())
.boxed()

5
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java
View File

@ -36,6 +36,7 @@ import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.collections4.MapUtils;
import org.flowable.form.api.FormInfo;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@ -115,7 +116,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
}
// 移除 variable 中 value 为 null 的 key
dto.getVariables().entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
MapUtils.emptyIfNull(dto.getVariables()).entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
List<AttachmentDTO> tempAttachments = ListUtils.defaultIfNull(dto.getAttachmentList(), new ArrayList<>());
if (StringUtils.hasText(dto.getSignatureUrl())) {
@ -145,7 +146,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
}
// 移除 variable 中 value 为 null 的 key
dto.getVariables().entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
MapUtils.emptyIfNull(dto.getVariables()).entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
List<AttachmentDTO> tempAttachments = ListUtils.defaultIfNull(dto.getAttachmentList(), new ArrayList<>());
if (StringUtils.hasText(dto.getSignatureUrl())) {