From b941236a02f5c61c293b77e7727846906315fd69 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Sun, 14 Jun 2026 10:45:34 +0800 Subject: [PATCH] =?UTF-8?q?flowable-service:BPMN=20=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E7=AB=AF=E7=82=B9=20+=20=E8=B5=B7=E6=B5=81=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=8F=AF=E8=AF=8A=E6=96=AD=E6=97=A5=E5=BF=97(P3=20=E7=9C=9F?= =?UTF-8?q?=E9=97=AD=E7=8E=AF=E6=94=AF=E6=92=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit POST /api/flow/deploy 经 RepositoryService 部署 BPMN(客户审批流程上线能力,prerequisite①); start 端点加 try/catch 记 流程key+变量类型谱+异常(起流失败原本不可见)。 样例 BPMN(assignee=${WFINITIATORUSERID})+ 提交审批全链实证:NOSUBMIT(1)→PROCESSING(2)+待办出现(assignee=ADMIN)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../eip4/flowservice/api/FlowController.java | 49 ++++++++++++++++--- .../eip4_test_approval.bpmn20.xml | 12 +++++ 2 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 flowable-service/src/main/resources/processes-samples/eip4_test_approval.bpmn20.xml diff --git a/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java b/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java index ff3f1e7..42600fc 100644 --- a/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java +++ b/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java @@ -51,6 +51,32 @@ public class FlowController { this.bizJdbc = bizJdbc; } + @PostMapping("/deploy") + @Operation(summary = "部署 BPMN 流程定义", + description = "经 RepositoryService 部署 BPMN20 XML;返回 deploymentId + 部署出的流程定义 key 列表。" + + "供客户审批流程 BPMN 上线(processName=流程 key,提交审批的 startWorkflow 据此起流)。") + public ResponseEntity> deploy(@RequestBody Map body) { + String name = body.get("name") != null ? body.get("name").toString().trim() : "deployment"; + Object xmlObj = body.get("bpmnXml"); + if (xmlObj == null || xmlObj.toString().isBlank()) { + return ResponseEntity.badRequest().body(Map.of("status", 1, "msg", "bpmnXml 不能为空")); + } + String resource = name.endsWith(".bpmn20.xml") ? name : name + ".bpmn20.xml"; + var deployment = repositoryService.createDeployment() + .name(name) + .addString(resource, xmlObj.toString()) + .deploy(); + List keys = repositoryService.createProcessDefinitionQuery() + .deploymentId(deployment.getId()).list().stream() + .map(org.flowable.engine.repository.ProcessDefinition::getKey) + .collect(Collectors.toList()); + Map r = new java.util.LinkedHashMap<>(); + r.put("status", 0); + r.put("deploymentId", deployment.getId()); + r.put("processKeys", keys); + return ResponseEntity.ok(r); + } + @GetMapping("/tasks/todo") @Operation(summary = "待办列表", description = "按 assignee(用户)或 candidateGroup(候选组,可多值)查活动待办;不传则查全部活动待办。" + "assignee 与候选维度同传时为 OR 语义(我的待办=指派给我的 ∪ 我候选的)——网关按 JWT userId+roles 全量传参依赖此语义") @@ -167,12 +193,23 @@ public class FlowController { @Operation(summary = "发起流程", description = "按 processDefinitionKey 或 processDefinitionId 发起,可带 businessKey 与变量") public ResponseEntity start(@RequestBody Requests.StartRequest req) { ProcessInstance pi; - if (req.processDefinitionId != null && !req.processDefinitionId.isBlank()) { - pi = runtimeService.startProcessInstanceById(req.processDefinitionId, req.businessKey, req.variables); - } else if (req.processDefinitionKey != null && !req.processDefinitionKey.isBlank()) { - pi = runtimeService.startProcessInstanceByKey(req.processDefinitionKey, req.businessKey, req.variables); - } else { - return ResponseEntity.badRequest().build(); + try { + if (req.processDefinitionId != null && !req.processDefinitionId.isBlank()) { + pi = runtimeService.startProcessInstanceById(req.processDefinitionId, req.businessKey, req.variables); + } else if (req.processDefinitionKey != null && !req.processDefinitionKey.isBlank()) { + pi = runtimeService.startProcessInstanceByKey(req.processDefinitionKey, req.businessKey, req.variables); + } else { + return ResponseEntity.badRequest().build(); + } + } catch (RuntimeException e) { + // 起流失败本应可诊断:记流程 key + 变量类型谱(定位不可持久化的变量类型)+ 异常 + String varTypes = req.variables == null ? "(none)" : req.variables.entrySet().stream() + .map(en -> en.getKey() + "=" + (en.getValue() == null ? "null" : en.getValue().getClass().getName())) + .collect(Collectors.joining(", ")); + org.slf4j.LoggerFactory.getLogger(FlowController.class).error( + "[起流失败] key={} id={} bizKey={} 变量类型[{}]: {}", + req.processDefinitionKey, req.processDefinitionId, req.businessKey, varTypes, e.toString(), e); + throw e; } return ResponseEntity.ok(ProcessInstanceDto.of(pi)); } diff --git a/flowable-service/src/main/resources/processes-samples/eip4_test_approval.bpmn20.xml b/flowable-service/src/main/resources/processes-samples/eip4_test_approval.bpmn20.xml new file mode 100644 index 0000000..ff77e0a --- /dev/null +++ b/flowable-service/src/main/resources/processes-samples/eip4_test_approval.bpmn20.xml @@ -0,0 +1,12 @@ + + + + + + + + + +