From 333de1e1af33662d3c0535904dd5de5f23339c74 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 21 Nov 2025 16:00:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(RDMP-3845)=20-=20=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?MQ=20=E5=B9=BF=E6=92=AD=E4=BA=8B=E4=BB=B6=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=98=E9=87=8F=E8=BE=93=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=B8=80=E4=BA=9B=E5=AF=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=97=A0=E5=85=B3=E7=B4=A7=E8=A6=81=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/listener/AbstractBpmnEventListener.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java index 9cef03b1f..36b6dd735 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java @@ -50,6 +50,12 @@ public abstract class AbstractBpmnEventListener impl return processDefinitionId.split(":")[0]; } + /** + * 移除一些业务不需要关心的变量 + * + * @param originVariables + * @return + */ public static Map removeBpmnConstantsVariables(Map originVariables) { if (originVariables == null) return new HashMap<>(); From 0c53b57a9c6682364e2d8d1c325e03dd6923f8a3 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 21 Nov 2025 17:24:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-5965)=20-=20=E8=B0=83=E6=95=B4=20a?= =?UTF-8?q?pi=20=E7=94=9F=E6=88=90=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/feign/bpmn/ProcessModelApi.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessModelApi.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessModelApi.java index e9e9bc932..6bb3ebe12 100644 --- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessModelApi.java +++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessModelApi.java @@ -46,7 +46,6 @@ import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC; */ //@FeignClient(name = "workflow-engine", url = "${axzo.service.workflow-engine:http://workflow-engine:8080}", configuration = CommonFeignConfiguration.class) @WorkflowEngineFeignClient -@Manageable public interface ProcessModelApi { /** @@ -57,6 +56,7 @@ public interface ProcessModelApi { */ @Operation(summary = "流程模型列表") @GetMapping("/api/process/model/page") + @Manageable @InvokeMode(SYNC) CommonResponse> page(@Validated @RequestBody BpmnModelSearchDTO dto); @@ -66,6 +66,7 @@ public interface ProcessModelApi { */ @Operation(summary = "创建流程模型") @PostMapping("/api/process/model/create") + @Manageable @InvokeMode(SYNC) CommonResponse create(@Validated @RequestBody BpmnModelCreateDTO dto); @@ -74,6 +75,7 @@ public interface ProcessModelApi { */ @Operation(summary = "通过模型ID查询指定流程模型") @GetMapping("/api/process/model/get") + @Manageable @InvokeMode(SYNC) CommonResponse getById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam(required = false) String processModelId, @RequestParam(required = false) String tenantId); @@ -83,6 +85,7 @@ public interface ProcessModelApi { */ @Operation(summary = "通过模型KEY查询指定流程模型") @GetMapping("/api/process/model/getByKey") + @Manageable @InvokeMode(SYNC) CommonResponse getByKey(@NotBlank(message = "流程模型 KEY 不能为空") @RequestParam(required = false) String processModelKey, @NotBlank(message = "租户不能为空") @RequestParam(required = false) String tenantId); @@ -96,6 +99,7 @@ public interface ProcessModelApi { */ @Operation(summary = "获取指定模型的扩展属性") @GetMapping("/api/process/model/ext") + @Manageable @InvokeMode(SYNC) CommonResponse getModelExt(@NotBlank(message = "模型 ID 不能为空") @RequestParam(required = false) String modelId); @@ -104,6 +108,7 @@ public interface ProcessModelApi { */ @Operation(summary = "更新流程模型") @PutMapping("/api/process/model/update") + @Manageable @InvokeMode(SYNC) CommonResponse update(@RequestBody BpmnModelUpdateDTO dto); @@ -115,6 +120,7 @@ public interface ProcessModelApi { */ @Operation(summary = "通过模型 ID 部署流程模型") @PostMapping("/api/process/model/deploy") + @Manageable @InvokeMode(SYNC) CommonResponse deployById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam(required = false) String processModelId, @RequestParam(required = false, defaultValue = "") String modelTenantId, @@ -127,6 +133,7 @@ public interface ProcessModelApi { */ @Operation(summary = "通过模型 KEY 部署流程模型") @PostMapping("/api/process/model/deployByKey") + @Manageable @InvokeMode(SYNC) CommonResponse deployByKey(@NotBlank(message = "流程模型 KEY 不能为空") @RequestParam(required = false) String processModelKey, @NotBlank(message = "租户不能为空") @RequestParam(required = false) String modelTenantId, @@ -142,6 +149,7 @@ public interface ProcessModelApi { */ @Operation(summary = "通过模型 ID 取消部署流程模型") @PostMapping("/api/process/model/undeploy") + @Manageable @InvokeMode(SYNC) CommonResponse unDeployById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam(required = false) String processModelId, @RequestParam(required = false, defaultValue = "") String tenantId, @@ -152,6 +160,7 @@ public interface ProcessModelApi { */ @Operation(summary = "删除指定模型 ID 的流程模型") @DeleteMapping("/api/process/model/delete") + @Manageable @InvokeMode(SYNC) CommonResponse deleteById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam String processModelId, @RequestParam(required = false, defaultValue = "") String tenantId); @@ -165,6 +174,7 @@ public interface ProcessModelApi { */ @Operation(summary = "删除指定模型 KEY 的流程模型") @DeleteMapping("/api/process/model/deleteByKey") + @Manageable @InvokeMode(SYNC) CommonResponse deleteByKey(@NotBlank(message = "流程模型 KEY 不能为空") @RequestParam String processModelKey, @RequestParam(required = false, defaultValue = "") String tenantId); @@ -179,6 +189,7 @@ public interface ProcessModelApi { */ @Operation(summary = "修改模型状态") @PostMapping("/api/process/model/changeStatus") + @Manageable @InvokeMode(SYNC) CommonResponse changeStatus(@NotBlank(message = "模型 ID 不能为空") @RequestParam String modelId, @NotNull(message = "状态不能为空") @RequestParam Integer status, @@ -194,6 +205,7 @@ public interface ProcessModelApi { */ @Operation(summary = "修改模型打印开关状态") @PostMapping("/api/process/model/print/changeStatus") + @Manageable @InvokeMode(SYNC) CommonResponse changePrintStatus(@NotBlank(message = "模型 ID 不能为空") @RequestParam String modelId, @NotNull(message = "状态不能为空") @RequestParam Integer status, @@ -206,6 +218,7 @@ public interface ProcessModelApi { */ @Operation(summary = "查询流程模型使用的分类列表") @GetMapping("/api/process/model/category/ids") + @Manageable @InvokeMode(SYNC) CommonResponse> getModelCategoryList(); @@ -216,6 +229,7 @@ public interface ProcessModelApi { */ @Operation(summary = "查询模型的租户集合") @GetMapping("/api/process/model/tenant/ids") + @Manageable @InvokeMode(SYNC) CommonResponse> getModelTenantIds(); @@ -227,6 +241,7 @@ public interface ProcessModelApi { */ @Operation(summary = "获取打印模板配置内容") @PostMapping("/api/process/model/print/template/config/query") + @Manageable @InvokeMode(SYNC) CommonResponse getPrintTemplateConfig(@Validated @RequestBody PrintTemplateConfigQueryDTO dto); @@ -238,6 +253,7 @@ public interface ProcessModelApi { */ @Operation(summary = "代运营重置打印模板") @PostMapping(value = "/api/process/model/print/template/config/reset") + @Manageable @InvokeMode(SYNC) CommonResponse resetPrintTemplateConfig(@Validated @RequestBody RestPrintTemplateConfigDTO dto); @@ -249,6 +265,7 @@ public interface ProcessModelApi { */ @Operation(summary = "搜索文档列表") @PostMapping(value = "/api/process/model/doc/page") + @Manageable @InvokeMode(SYNC) CommonResponse> docPage(@Validated @RequestBody DocSearchDTO dto); @@ -259,6 +276,7 @@ public interface ProcessModelApi { */ @Operation(summary = "获取指定 docIds 文档列表") @PostMapping(value = "/api/process/model/doc/ids") + @Manageable @InvokeMode(SYNC) CommonResponse> docByIds(@Validated @RequestBody DocByIdDTO dto); @@ -281,6 +299,7 @@ public interface ProcessModelApi { */ @Operation(summary = "获取关联 HiPrint 类型文档模板内容") @PostMapping(value = "/api/process/model/hi-print/content/get") + @Manageable @InvokeMode(SYNC) CommonResponse getHiPrintContent(@RequestParam String fileRelationId); @@ -291,6 +310,7 @@ public interface ProcessModelApi { */ @Operation(summary = "添加关联文档") @PutMapping(value = "/api/process/model/doc/create") + @Manageable @InvokeMode(SYNC) CommonResponse createDoc(@Validated @RequestBody DocCreateDTO dto); @@ -301,6 +321,7 @@ public interface ProcessModelApi { */ @Operation(summary = "修改关联文档") @PostMapping(value = "/api/process/model/doc/update") + @Manageable @InvokeMode(SYNC) CommonResponse updateDoc(@Validated @RequestBody DocUpdateDTO dto); @@ -312,6 +333,7 @@ public interface ProcessModelApi { */ @Operation(summary = "克隆关联文档") @PostMapping(value = "/api/process/model/doc/clone") + @Manageable @InvokeMode(SYNC) CommonResponse cloneDoc(@RequestParam("id") Long docId); @@ -322,6 +344,7 @@ public interface ProcessModelApi { */ @Operation(summary = "删除指定文档") @DeleteMapping(value = "/api/process/model/doc/delete") + @Manageable @InvokeMode(SYNC) CommonResponse deleteDoc(@RequestParam("id") Long docId); @@ -333,6 +356,7 @@ public interface ProcessModelApi { */ @Operation(summary = "关联文档配置排序") @PostMapping(value = "/api/process/model/doc/order") + @Manageable @InvokeMode(SYNC) CommonResponse orderDoc(@Validated @RequestBody DocOrderDTO dto); @@ -344,6 +368,7 @@ public interface ProcessModelApi { */ @Operation(summary = "重置关联文档配置") @PostMapping(value = "/api/process/model/doc/reset") + @Manageable @InvokeMode(SYNC) CommonResponse resetDoc(@Validated @RequestBody DocResetDTO dto); @@ -355,6 +380,7 @@ public interface ProcessModelApi { */ @Operation(summary = "设置关联文档的停启用状态") @PostMapping(value = "/api/process/model/doc/status") + @Manageable @InvokeMode(SYNC) CommonResponse statusDoc(@Validated @RequestBody DocStatusDTO dto); @@ -365,6 +391,7 @@ public interface ProcessModelApi { */ @Operation(summary = "设置关联文档的必选状态") @PostMapping(value = "/api/process/model/doc/require") + @Manageable @InvokeMode(SYNC) CommonResponse requireDoc(@Validated @RequestBody DocStatusDTO dto); @@ -375,6 +402,7 @@ public interface ProcessModelApi { */ @Operation(summary = "特殊的查询设置过关联过文档的工作台 ID 集合") @PostMapping(value = "/api/process/model/has/docs/tenantId") + @Manageable @InvokeMode(SYNC) CommonResponse> hasFilesTenantIds(@Validated @RequestBody DocTenantQueryDTO dto); }