diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/workflow/ProcessCoreServiceBridge.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/workflow/ProcessCoreServiceBridge.java new file mode 100644 index 0000000..efd581c --- /dev/null +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/workflow/ProcessCoreServiceBridge.java @@ -0,0 +1,104 @@ +package com.eip4.platform.flowgateway.workflow; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Properties; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import com.dsasp.server.common.exception.ValidationException; +import com.dsasp.server.common.user.service.LoggedInUser; +import com.dsasp.server.common.workflow.service.ProcessCoreService; +import com.eip4.platform.flowgateway.client.FlowableClient; +import com.eip4.platform.flowgateway.client.ProcessInstanceDto; +import com.eip4.platform.flowgateway.writeback.StatusWriteback; + +/** + * 「提交审批」桥接 bean:补齐保真层服务流引擎按名调的 {@code processCoreService.startWorkflow(...)}。 + * + *

根因(逐流写 QA dogfooding 深挖):amis「提交审批」走 SAVE_AND_SUBMIT 复合 meta-flow, + * {@code _SUBMIT} 子流的 SERVICE 节点 {@code beanName="processCoreService" method="startWorkflow"} + * 经 {@code SpringBeanOsgiServices.getBeanByName("processCoreService")}(= {@code applicationContext.getBean(name)}) + * 按名字查 bean,再 {@code obj.getClass().getMethod("startWorkflow", classObjs)} 反射调用。 + * 全库无该名 bean → {@code FlowExcuteServiceImpl} 抛 {@code RuntimeException("no service")},影响 248 个写/审批流。 + * + *

本桥接把引擎调的 {@code startWorkflow(...)} 桥到既有 {@link FlowableClient#start(Map)} + * (HTTP → flowable-service:8089)+ {@link StatusWriteback#updateStatus}(SYS_DATASTATUS 起审批状态推进)。 + * 无需 implements 25 方法的 {@code ProcessCoreService} 接口——引擎仅按名 + 签名反射,故只需一个签名匹配的公开方法。 + * + *

反射签名锁定:参数类型须与引擎 {@code getClass(field)}(= {@code Class.forName(field.getType())}) + * 解析的裸类型逐一匹配——processName/tableName/businessKey=String、variables=裸 {@link Map}、ctx={@link Properties}; + * 返回 boolean 对应 {@code }。改动须经 {@code ProcessCoreServiceBridgeTest} 反射可解析性测试守护。 + * + *

设计:{@code docs/plans/2026-06-14-提交审批桥接-design.md}(MVP,仅 startWorkflow;BPMN 部署/重提交去重等后置)。 + */ +@Component("processCoreService") +public class ProcessCoreServiceBridge { + + /** + * 发起时间变量键。保真层 {@code ProcessCoreService} 常量只到 INITIATORUSERID/INITIATORDEPARTID, + * 发起时间无对应常量;沿用其 {@code WF...} 命名约定补此键,注入流程变量供 BPMN/候选人解析引用。 + */ + public static final String INITIATORTIME = "WFINITIATORTIME"; + + private static final Logger log = LoggerFactory.getLogger(ProcessCoreServiceBridge.class); + + private final FlowableClient flowableClient; + private final StatusWriteback statusWriteback; + + public ProcessCoreServiceBridge(FlowableClient flowableClient, StatusWriteback statusWriteback) { + this.flowableClient = flowableClient; + this.statusWriteback = statusWriteback; + } + + /** + * 启动审批流程(对齐旧 {@code ProcessCoreServiceImpl.startWorkflow} 的 MVP 编排)。 + * + *

参数顺序/类型固定,供引擎按名 + 签名反射调用,勿改(见类注释「反射签名锁定」)。 + * + * @param processName 流程定义 key(旧 Activiti 约定:取流程中文显示名作 startProcessInstanceByKey 的 key) + * @param variables 业务/流程变量(裸 Map 以匹配引擎反射解析的参数类型) + * @param tableName 业务实体表名(写 SYS_DATASTATUS 时携带) + * @param businessKey 业务记录主键(= 流程 businessKey;空则抛 {@link ValidationException}) + * @param ctx 引擎上下文(取 CURRENTUSER/CURRENTDEPART 作发起人) + * @return 是否成功发起(恒 true;失败由 {@link FlowableClient} 抛异常上抛,经 gracefulFlowError 兜底) + */ + public boolean startWorkflow(String processName, Map variables, + String tableName, String businessKey, Properties ctx) { + if (businessKey == null || businessKey.isBlank()) { + throw new ValidationException("定义启动流程提交的业务记录不存在,请联系开发商"); + } + + @SuppressWarnings("unchecked") + Map vars = variables != null + ? new LinkedHashMap(variables) + : new LinkedHashMap(); + + // 注入发起人变量(对齐旧 startWorkflow:从 ctx 取当前用户/部门 + 发起时间) + String currentUser = ctx != null ? ctx.getProperty(LoggedInUser.CURRENTUSER) : null; + String currentDepart = ctx != null ? ctx.getProperty(LoggedInUser.CURRENTDEPART) : null; + vars.put(ProcessCoreService.INITIATORUSERID, currentUser); + vars.put(ProcessCoreService.INITIATORDEPARTID, currentDepart); + vars.put(INITIATORTIME, new java.util.Date()); + + Map startRequest = new LinkedHashMap<>(); + startRequest.put("processDefinitionKey", processName); + startRequest.put("businessKey", businessKey); + startRequest.put("variables", vars); + + ProcessInstanceDto inst = flowableClient.start(startRequest); + + // 起审批的 NOSUBMIT(1) → PROCESSING(2)/PASS(3)。直接 updateStatus(非 afterComplete): + // 起审批总是从 1 前推,无需 afterComplete 的单调守卫(其要求 oldstatus 已存在且 < target)。 + int target = inst != null && inst.ended + ? ProcessCoreService.STATUS_PASS + : ProcessCoreService.STATUS_PROCESSING; + statusWriteback.updateStatus(businessKey, tableName, target); + + log.debug("起审批: processName={} businessKey={} table={} ended={} → status={}", + processName, businessKey, tableName, inst != null && inst.ended, target); + return true; + } +} diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessCoreServiceBridgeTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessCoreServiceBridgeTest.java new file mode 100644 index 0000000..a3ec981 --- /dev/null +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessCoreServiceBridgeTest.java @@ -0,0 +1,148 @@ +package com.eip4.platform.flowgateway; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Method; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Properties; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import com.dsasp.server.common.exception.ValidationException; +import com.dsasp.server.common.user.service.LoggedInUser; +import com.dsasp.server.common.workflow.service.ProcessCoreService; +import com.eip4.platform.flowgateway.client.FlowableClient; +import com.eip4.platform.flowgateway.client.ProcessInstanceDto; +import com.eip4.platform.flowgateway.workflow.ProcessCoreServiceBridge; +import com.eip4.platform.flowgateway.writeback.StatusWriteback; + +/** + * 提交审批桥接 bean 单测(对齐设计 docs/plans/2026-06-14-提交审批桥接-design.md §六)。 + * + *

覆盖:正常起审批(startRequest 三要素 + 发起人变量注入 + 未结束→2/已结束→3 回写 + 返回 true)、 + * businessKey 空抛 ValidationException、引擎反射可解析性(按名 + (String,Map,String,String,Properties) 签名)。 + */ +@ExtendWith(MockitoExtension.class) +class ProcessCoreServiceBridgeTest { + + @Mock + FlowableClient flowableClient; + + @Mock + StatusWriteback statusWriteback; + + private ProcessCoreServiceBridge bridge() { + return new ProcessCoreServiceBridge(flowableClient, statusWriteback); + } + + private Properties ctxWith(String user, String depart) { + Properties ctx = new Properties(); + if (user != null) { + ctx.setProperty(LoggedInUser.CURRENTUSER, user); + } + if (depart != null) { + ctx.setProperty(LoggedInUser.CURRENTDEPART, depart); + } + return ctx; + } + + private ProcessInstanceDto instance(boolean ended) { + ProcessInstanceDto inst = new ProcessInstanceDto(); + inst.id = "PROC-1"; + inst.ended = ended; + return inst; + } + + @Test + @SuppressWarnings("unchecked") + void 正常_起审批_startRequest三要素_发起人变量注入_未结束回写处理中2_返回true() { + when(flowableClient.start(org.mockito.ArgumentMatchers.anyMap())).thenReturn(instance(false)); + + Map variables = new LinkedHashMap<>(); + variables.put("AMOUNT", 100); + + boolean ok = bridge().startWorkflow( + "收房变更申请", variables, "OA_NOTICE", "BK-1", ctxWith("U-007", "D-100")); + + assertThat(ok).isTrue(); + + ArgumentCaptor> reqCap = ArgumentCaptor.forClass(Map.class); + verify(flowableClient).start(reqCap.capture()); + Map req = reqCap.getValue(); + assertThat(req.get("processDefinitionKey")).isEqualTo("收房变更申请"); + assertThat(req.get("businessKey")).isEqualTo("BK-1"); + + Object varsObj = req.get("variables"); + assertThat(varsObj).isInstanceOf(Map.class); + Map vars = (Map) varsObj; + // 原始业务变量保留 + assertThat(vars.get("AMOUNT")).isEqualTo(100); + // 发起人变量已注入(对齐旧:ProcessCoreService.INITIATORUSERID/INITIATORDEPARTID + 发起时间) + assertThat(vars.get(ProcessCoreService.INITIATORUSERID)).isEqualTo("U-007"); + assertThat(vars.get(ProcessCoreService.INITIATORDEPARTID)).isEqualTo("D-100"); + assertThat(vars).containsKey(ProcessCoreServiceBridge.INITIATORTIME); + assertThat(vars.get(ProcessCoreServiceBridge.INITIATORTIME)).isNotNull(); + + // 未结束 → SYS_DATASTATUS 写 PROCESSING(2) + verify(statusWriteback).updateStatus( + eq("BK-1"), eq("OA_NOTICE"), eq(ProcessCoreService.STATUS_PROCESSING)); + } + + @Test + void 起审批_流程立即结束时回写通过3() { + when(flowableClient.start(org.mockito.ArgumentMatchers.anyMap())).thenReturn(instance(true)); + + boolean ok = bridge().startWorkflow( + "审批流", new LinkedHashMap<>(), "OA_NOTICE", "BK-2", ctxWith("U-1", "D-1")); + + assertThat(ok).isTrue(); + verify(statusWriteback).updateStatus( + eq("BK-2"), eq("OA_NOTICE"), eq(ProcessCoreService.STATUS_PASS)); + } + + @Test + void businessKey空_抛ValidationException_不起流程不回写() { + ProcessCoreServiceBridge b = bridge(); + Properties ctx = ctxWith("U-1", "D-1"); + + assertThatThrownBy(() -> + b.startWorkflow("审批流", new LinkedHashMap<>(), "OA_NOTICE", null, ctx)) + .isInstanceOf(ValidationException.class) + .hasMessage("定义启动流程提交的业务记录不存在,请联系开发商"); + + assertThatThrownBy(() -> + b.startWorkflow("审批流", new LinkedHashMap<>(), "OA_NOTICE", " ", ctx)) + .isInstanceOf(ValidationException.class); + + verify(flowableClient, never()).start(org.mockito.ArgumentMatchers.anyMap()); + verify(statusWriteback, never()).updateStatus( + org.mockito.ArgumentMatchers.anyString(), + org.mockito.ArgumentMatchers.anyString(), + org.mockito.ArgumentMatchers.anyInt()); + } + + /** + * 引擎经 SpringBeanOsgiServices.getBeanByName("processCoreService") 取 bean,再 + * obj.getClass().getMethod("startWorkflow", classObjs) 按名 + 反射参数类型解析调用。 + * 此测试守护该签名不被改坏(String, Map, String, String, Properties)。 + */ + @Test + void 反射可解析性_引擎按名加签名查得到startWorkflow() throws NoSuchMethodException { + Method m = ProcessCoreServiceBridge.class.getMethod( + "startWorkflow", + String.class, Map.class, String.class, String.class, Properties.class); + + assertThat(m).isNotNull(); + assertThat(m.getReturnType()).isEqualTo(boolean.class); + } +}