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-13 18:10:51 +08:00
commit ebdf81e3a9
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/PrintAdminApi.java
View File

@ -96,7 +96,7 @@ public interface PrintAdminApi {
* 后端请求指定流程日志 PDF 文件生成, 实现是异步的。 * 后端请求指定流程日志 PDF 文件生成, 实现是异步的。
* <p> * <p>
* 请使用 {@link PrintAdminApi#queryProcessLogPdfResult(QueryProcessLogPdfDTO)} 函数查询， * 请使用 {@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 * @return
*/ */

12
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/PrintProcessLogPdfDTO.java
View File

@ -33,4 +33,16 @@ public class PrintProcessLogPdfDTO {
@ApiModelProperty(value = "访问者的 PersonId") @ApiModelProperty(value = "访问者的 PersonId")
@NotBlank(message = "访问者的 personId 不能为空") @NotBlank(message = "访问者的 personId 不能为空")
private String personId; private String personId;
/**
* 自定义该审批日志的 bizCode
* 可不传，默认值为： workflow-process-log
*/
private String bizCode;
/**
* 自定义该审批日志的 bizKey
* 可不传， 默认值为：{@link PrintProcessLogPdfDTO#processInstanceId}
*/
private String bizKey;
} }

11
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/print/QueryProcessLogPdfDTO.java
View File

@ -27,4 +27,15 @@ public class QueryProcessLogPdfDTO {
@NotBlank(message = "审批实例 ID 不能为空") @NotBlank(message = "审批实例 ID 不能为空")
private String processInstanceId; private String processInstanceId;
/**
* 自定义该审批日志的 bizCode
* 可不传，默认值为： workflow-process-log
*/
private String bizCode;
/**
* 自定义该审批日志的 bizKey
* 可不传， 默认值为：{@link QueryProcessLogPdfDTO#processInstanceId}
*/
private String bizKey;
} }

8
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
View File

@ -595,8 +595,8 @@ public class PrintAdminController implements PrintAdminApi {
@Override @Override
public CommonResponse<String> createProcessLogPdf(@Validated @RequestBody PrintProcessLogPdfDTO dto) { public CommonResponse<String> createProcessLogPdf(@Validated @RequestBody PrintProcessLogPdfDTO dto) {
SubmitConversionTaskRequest request = new SubmitConversionTaskRequest(); SubmitConversionTaskRequest request = new SubmitConversionTaskRequest();
request.setBizCode("workflow-process-log"); request.setBizCode(StringUtils.hasText(dto.getBizCode()) ? dto.getBizCode() : "workflow-process-log");
request.setBizKey(dto.getProcessInstanceId()); request.setBizKey(StringUtils.hasText(dto.getBizKey()) ? dto.getBizKey() : dto.getProcessInstanceId());
request.setConversionType(DocConversionTypeEnum.HTML_URL_TO_PDF); request.setConversionType(DocConversionTypeEnum.HTML_URL_TO_PDF);
request.setFileName(String.format(refreshProperties.getProcessLogHtmlUrl(), dto.getProcessInstanceId(), dto.getPersonId())); request.setFileName(String.format(refreshProperties.getProcessLogHtmlUrl(), dto.getProcessInstanceId(), dto.getPersonId()));
String taskId = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.submitConvertTask(request), "创建网页转 PDF 的异步任务", request); String taskId = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.submitConvertTask(request), "创建网页转 PDF 的异步任务", request);
@ -608,8 +608,8 @@ public class PrintAdminController implements PrintAdminApi {
@Override @Override
public CommonResponse<ProcessLogPdfResultDTO> queryProcessLogPdfResult(@Validated @RequestBody QueryProcessLogPdfDTO dto) { public CommonResponse<ProcessLogPdfResultDTO> queryProcessLogPdfResult(@Validated @RequestBody QueryProcessLogPdfDTO dto) {
QueryConversionTaskRequestV2 request = new QueryConversionTaskRequestV2(); QueryConversionTaskRequestV2 request = new QueryConversionTaskRequestV2();
request.setBizCode("workflow-process-log"); request.setBizCode(StringUtils.hasText(dto.getBizCode()) ? dto.getBizCode() : "workflow-process-log");
request.setBizKey(dto.getProcessInstanceId()); request.setBizKeys(Lists.newArrayList(StringUtils.hasText(dto.getBizKey()) ? dto.getBizKey() : dto.getProcessInstanceId()));
List<FileConvertResultResp> taskConvertResults = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.queryConvertResultByBiz(request), "查询流程日志转 PDF 的结果", request); List<FileConvertResultResp> taskConvertResults = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.queryConvertResultByBiz(request), "查询流程日志转 PDF 的结果", request);
List<ProcessLogPdfResultDTO> results = BeanMapper.copyList(taskConvertResults, ProcessLogPdfResultDTO.class, (s, t) -> { List<ProcessLogPdfResultDTO> results = BeanMapper.copyList(taskConvertResults, ProcessLogPdfResultDTO.class, (s, t) -> {
t.setPdfFileKey(s.getResultFileFileKey()); t.setPdfFileKey(s.getResultFileFileKey());