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

feat(REQ-5965) - 调整第二版日志打印接口的逻辑，优化网址的传入

Browse Source
This commit is contained in:
wangli 2025-11-04 09:34:52 +08:00
parent 33897ac687
commit 496eef6b5c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/CustomDocDTO.java
View File

@ -53,7 +53,7 @@ public class CustomDocDTO implements Serializable {
private String fileKey;
/**
* 文件的类型
* 文件的类型,如果要替换变量，支持 docx 格式，doc 格式不支持。
*/
@NotNull(message = "业务自定义文件的类型不能为空")
private FileTypeEnum fileType;

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
View File

@ -108,7 +108,7 @@ public class SupportRefreshProperties {
@Value("${workflow.ignoreMqAlterApplicationNames:}")
private List<String> ignoreMqAlterApplicationNames;
@Value("${workflow.processLogHtmlUrl:https://www.axzo.cn/}")
@Value("${workflow.processLogHtmlUrl:https://taskflow-web.axzo.cn/#/document/log?processInstanceId=%s&personId=%d}")
private String processLogHtmlUrl;
}

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

@ -51,7 +51,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.common.engine.impl.interceptor.CommandExecutor;
@ -64,6 +63,7 @@ import org.flowable.form.model.FormField;
import org.flowable.form.model.FormFieldTypes;
import org.flowable.form.model.SimpleFormModel;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.slf4j.Logger;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@ -144,13 +144,13 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
* @author wangli
* @since 2025-01-16 17:48
*/
@Slf4j
@RequestMapping({"/web/v1/api/print/admin", "/api/print/admin"})
@RestController
@ErrorReporter
@Validated
public class PrintAdminController implements PrintAdminApi {
private static final Logger log = org.slf4j.LoggerFactory.getLogger(PrintAdminController.class);
@Resource
private FormRepositoryService formRepositoryService;
@Resource
@ -592,7 +592,7 @@ public class PrintAdminController implements PrintAdminApi {
request.setBizCode("workflow-process-log");
request.setBizKey(dto.getProcessInstanceId());
request.setConversionType(DocConversionTypeEnum.HTML_URL_TO_PDF);
request.setFileName(refreshProperties.getProcessLogHtmlUrl());
request.setFileName(String.format(refreshProperties.getProcessLogHtmlUrl(), dto.getProcessInstanceId(), dto.getPersonId()));
request.setFileKey(dto.getPersonId());
String taskId = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.submitConvertTask(request), "创建网页转 PDF 的异步任务", request);
return CommonResponse.success(taskId);