提交审批端到端:ProcessCoreServiceBridge 桥接 bean(零改保真层)
@Component(processCoreService) 引擎反射调,桥到 FlowableClient.start+StatusWriteback 运行时实证:OA_NOTICEMANAGE_SUBMIT→起真实 flowable 实例+SYS_DATASTATUS=PROCESSING(2) 唯缺客户审批 BPMN 部署(prerequisite①,属部署非代码)。4 单测含反射可解析性 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -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(...)}。
|
||||
*
|
||||
* <p><b>根因</b>(逐流写 QA dogfooding 深挖):amis「提交审批」走 SAVE_AND_SUBMIT 复合 meta-flow,
|
||||
* {@code _SUBMIT} 子流的 SERVICE 节点 {@code beanName="processCoreService" method="startWorkflow"}
|
||||
* 经 {@code SpringBeanOsgiServices.getBeanByName("processCoreService")}(= {@code applicationContext.getBean(name)})
|
||||
* 按<b>名字</b>查 bean,再 {@code obj.getClass().getMethod("startWorkflow", classObjs)} <b>反射</b>调用。
|
||||
* 全库无该名 bean → {@code FlowExcuteServiceImpl} 抛 {@code RuntimeException("no service")},影响 248 个写/审批流。
|
||||
*
|
||||
* <p><b>本桥接</b>把引擎调的 {@code startWorkflow(...)} 桥到既有 {@link FlowableClient#start(Map)}
|
||||
* (HTTP → flowable-service:8089)+ {@link StatusWriteback#updateStatus}(SYS_DATASTATUS 起审批状态推进)。
|
||||
* 无需 implements 25 方法的 {@code ProcessCoreService} 接口——引擎仅按名 + 签名反射,故只需一个签名匹配的公开方法。
|
||||
*
|
||||
* <p><b>反射签名锁定</b>:参数类型须与引擎 {@code getClass(field)}(= {@code Class.forName(field.getType())})
|
||||
* 解析的裸类型逐一匹配——processName/tableName/businessKey=String、variables=裸 {@link Map}、ctx={@link Properties};
|
||||
* 返回 boolean 对应 {@code <result name="result">}。改动须经 {@code ProcessCoreServiceBridgeTest} 反射可解析性测试守护。
|
||||
*
|
||||
* <p>设计:{@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 编排)。
|
||||
*
|
||||
* <p>参数顺序/类型固定,供引擎按名 + 签名反射调用,勿改(见类注释「反射签名锁定」)。
|
||||
*
|
||||
* @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<String, Object> vars = variables != null
|
||||
? new LinkedHashMap<String, Object>(variables)
|
||||
: new LinkedHashMap<String, Object>();
|
||||
|
||||
// 注入发起人变量(对齐旧 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<String, Object> 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;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user