From edf617cb6b7b130a23f10de98ebab457ce4976c3 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 13 Nov 2025 18:07:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-5965)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A1=E6=89=B9=E6=97=A5=E6=9C=9F=20PDF?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/client/feign/manage/PrintAdminApi.java | 2 +- .../request/bpmn/print/PrintProcessLogPdfDTO.java | 12 ++++++++++++ .../request/bpmn/print/QueryProcessLogPdfDTO.java | 11 +++++++++++ .../controller/web/manage/PrintAdminController.java | 8 ++++---- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/PrintAdminApi.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/PrintAdminApi.java index 38ff9b3ba..3e4fe494c 100644 --- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/PrintAdminApi.java +++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/PrintAdminApi.java @@ -96,7 +96,7 @@ public interface PrintAdminApi { * 后端请求指定流程日志 PDF 文件生成, 实现是异步的。 *

* 请使用 {@link PrintAdminApi#queryProcessLogPdfResult(QueryProcessLogPdfDTO)} 函数查询， - * 或者使用 {@link cn.axzo.nanopart.doc.api.conversion.DocConversionApi#queryConvertResultByBiz} 函数查询，bizCode:固定为"workflow-process-log", bizKey:为实例 ID + * 或者使用 {@link cn.axzo.nanopart.doc.api.conversion.DocConversionApi#queryConvertResultByBiz(cn.axzo.nanopart.doc.api.conversion.req.QueryConversionTaskRequestV2)} 函数查询，该接口入参默认情况下应该为：bizCode:固定为"workflow-process-log", bizKey:为实例 ID * * @return */ diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/PrintProcessLogPdfDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/PrintProcessLogPdfDTO.java index 2c48315a0..8b813bef4 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/PrintProcessLogPdfDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/PrintProcessLogPdfDTO.java @@ -33,4 +33,16 @@ public class PrintProcessLogPdfDTO { @ApiModelProperty(value = "访问者的 PersonId") @NotBlank(message = "访问者的 personId 不能为空") private String personId; + + /** + * 自定义该审批日志的 bizCode + * 可不传，默认值为： workflow-process-log + */ + private String bizCode; + + /** + * 自定义该审批日志的 bizKey + * 可不传， 默认值为：{@link PrintProcessLogPdfDTO#processInstanceId} + */ + private String bizKey; } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/QueryProcessLogPdfDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/QueryProcessLogPdfDTO.java index 734d5f6d2..ec0e16a0e 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/QueryProcessLogPdfDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/QueryProcessLogPdfDTO.java @@ -27,4 +27,15 @@ public class QueryProcessLogPdfDTO { @NotBlank(message = "审批实例 ID 不能为空") private String processInstanceId; + /** + * 自定义该审批日志的 bizCode + * 可不传，默认值为： workflow-process-log + */ + private String bizCode; + + /** + * 自定义该审批日志的 bizKey + * 可不传， 默认值为：{@link QueryProcessLogPdfDTO#processInstanceId} + */ + private String bizKey; } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java index 3d67bd9c3..2a27e71d4 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java @@ -595,8 +595,8 @@ public class PrintAdminController implements PrintAdminApi { @Override public CommonResponse createProcessLogPdf(@Validated @RequestBody PrintProcessLogPdfDTO dto) { SubmitConversionTaskRequest request = new SubmitConversionTaskRequest(); - request.setBizCode("workflow-process-log"); - request.setBizKey(dto.getProcessInstanceId()); + request.setBizCode(StringUtils.hasText(dto.getBizCode()) ? dto.getBizCode() : "workflow-process-log"); + request.setBizKey(StringUtils.hasText(dto.getBizKey()) ? dto.getBizKey() : dto.getProcessInstanceId()); request.setConversionType(DocConversionTypeEnum.HTML_URL_TO_PDF); request.setFileName(String.format(refreshProperties.getProcessLogHtmlUrl(), dto.getProcessInstanceId(), dto.getPersonId())); String taskId = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.submitConvertTask(request), "创建网页转 PDF 的异步任务", request); @@ -608,8 +608,8 @@ public class PrintAdminController implements PrintAdminApi { @Override public CommonResponse queryProcessLogPdfResult(@Validated @RequestBody QueryProcessLogPdfDTO dto) { QueryConversionTaskRequestV2 request = new QueryConversionTaskRequestV2(); - request.setBizCode("workflow-process-log"); - request.setBizKey(dto.getProcessInstanceId()); + request.setBizCode(StringUtils.hasText(dto.getBizCode()) ? dto.getBizCode() : "workflow-process-log"); + request.setBizKeys(Lists.newArrayList(StringUtils.hasText(dto.getBizKey()) ? dto.getBizKey() : dto.getProcessInstanceId())); List taskConvertResults = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.queryConvertResultByBiz(request), "查询流程日志转 PDF 的结果", request); List results = BeanMapper.copyList(taskConvertResults, ProcessLogPdfResultDTO.class, (s, t) -> { t.setPdfFileKey(s.getResultFileFileKey());