feat(metadata): 服务流执行 REST 门面 FlowController + 本地自举 + 单测

P1-2 第二步:报表方案 D 类——79 个 selectservice 服务流的统一 REST 化入口。

FlowController(com.eip4.platform.metadata.web):
  GET  /api/flow/{id}?k=v   query 参数 → 服务流入参 map(查询/报表类)
  POST /api/flow/{id} body  JSON body  → 服务流入参 map(参数多/带结构)
  统一封装 {status,msg,data};响应递归归一化(GeneralPOJO→平面行、
  listSelect 结果 {listresult,pagecount}→amis {items,total})。OpenAPI 注解。
  REST 入口读写时机:引擎不区分读写,P1 不在门面做引擎级读写闸,由调用方按
  「流定义 XML 审阅」确认查询/报表类后放行;风险与 P2 三层防护待办写入注释与报告。

适配(P1 服务流脚本编译):SecureGroovyScriptEngineFactory 的 DEFAULTIMPORTSLIST
移除两条 Vaadin 客户端 UI 默认导入(client.groovy.TestService、
com.dsasp.client.viewframework.component.MainComponent)——它们逐脚本注入,
classpath 缺失会使每个服务流脚本编译失败;与服务端取数无关,原值登记于注释供 diff。

LegacyXmlWiring:补 FlowServiceImpl.setJdbcTemplate(等价原 XML <property> 注入)。

本地自举:platform-parity bootstrap-flow.sql(幂等)——在 eip4m0 上建 SYS_SERVICEFLOW
+ 自描述元数据 + 最小查询流 EIP4M0_USERGROUP_SEARCH,参照 parity bootstrap 思路,
无客户库副本时引擎可独立跑通。

单测 18 例:FlowModelParseTest(9,XML 解析/参数绑定/默认流生成/往返序列化)+
FlowControllerTest(8,mock 引擎,GET/POST 参数透传 + 响应归一化)+
FlowExecuteLocalIT(1,@SpringBootTest local profile,自举 SQL + 真实引擎执行 +
二次一致;eip4m0 不可达则 assumeTrue 跳过)。全绿。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-11 12:01:15 +08:00
parent de72116502
commit f0500647be
7 changed files with 731 additions and 4 deletions

View File

@@ -88,9 +88,14 @@ public class SecureGroovyScriptEngineFactory extends GroovyScriptEngineFactory{
"com.dsasp.server.common.function.GetServicesFunction",
"com.dsasp.server.common.function.GetDefaultValueFunction",
"com.dsasp.server.common.function.GetValueFunction",
"com.dsasp.client.viewframework.template.util.Console",
"client.groovy.TestService",
"com.dsasp.client.viewframework.component.MainComponent"
"com.dsasp.client.viewframework.template.util.Console"
// 适配(P1 服务流引擎):移除两条 Vaadin 客户端 UI 默认导入——它们经 imports.addImport
// 逐脚本注入,而 client.groovy.TestService / com.dsasp.client.viewframework.component.MainComponent
// 属已淘汰的 Vaadin 表现层(eip4-platform 保真层不含),classpath 缺失会使「每一个」服务流脚本
// 编译失败(MultipleCompilationErrorsException: unable to resolve class)。两类与服务流
// 服务端取数逻辑无关。原版两条登记于此供 diff 溯源:
// "client.groovy.TestService", "com.dsasp.client.viewframework.component.MainComponent"
// 详见 P1 服务流实测报告「替换类登记」与迁移手册新增坑位。
]
def DEFAULTSTARIMPORTSLIST=[

View File

@@ -0,0 +1,167 @@
package com.dsasp.server.core.service.flow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import com.dsasp.server.common.core.FlowDefinition;
import com.dsasp.server.core.service.flow.model.BaseFlowConvert;
import com.dsasp.server.core.service.flow.model.DefaultFlowHelper;
import com.dsasp.server.core.service.flow.model.Field;
import com.dsasp.server.core.service.flow.model.Flow;
import com.dsasp.server.core.service.flow.model.Node;
import com.dsasp.server.core.service.flow.model.ServiceBean;
import com.dsasp.server.core.service.flow.model.Transition;
/**
* 服务流模型解析/参数绑定纯逻辑单测(无 Spring/DB)。
*
* <p>覆盖移植引擎的 XML 解析(Flow.initial via SAXReader+dom4j 2.x)、参数(input field)
* 绑定、service 节点解析、转移条件、以及默认流生成(DefaultFlowHelper)与往返序列化
* (BaseFlowConvert.convertToXml)。这些是 P1 服务流引擎在 REST 入口之下的核心契约,
* 验证 dom4j 2.x selectNodes 转型修复后解析行为与 framework 一致。
*/
class FlowModelParseTest {
private static final String SEARCH_FLOW_XML =
"<flow id=\"EIP4M0_USERGROUP_SEARCH\">"
+ " <input>"
+ " <field name=\"map\" type=\"java.util.Map\" required=\"true\"/>"
+ " <field name=\"ctx\" type=\"java.util.Properties\" required=\"true\"/>"
+ " <field name=\"tableName\" type=\"java.lang.String\" required=\"true\" initValue=\"SYS_USERGROUP\"/>"
+ " </input>"
+ " <start id=\"Start\" name=\"开始\">"
+ " <script type=\"groovy\" key=\"s1\"><![CDATA[def x = 1;]]></script>"
+ " </start>"
+ " <node id=\"search\" name=\"查询\">"
+ " <service beanName=\"pojoCRUDService\" method=\"listSelect\">"
+ " <list><arg name=\"map\"/><arg name=\"tableName\"/><arg name=\"ctx\"/></list>"
+ " <result name=\"result\"/>"
+ " </service>"
+ " </node>"
+ " <transition from=\"Start\" to=\"search\"/>"
+ " <transition from=\"search\" to=\"End\"/>"
+ " <end id=\"End\" name=\"结束\"/>"
+ " <output>"
+ " <field name=\"result\" type=\"java.util.Map\"/>"
+ " </output>"
+ "</flow>";
@Test
@DisplayName("1. 解析 input 字段:名称/类型/必填/初值正确绑定")
void parseInputFields() {
Flow flow = new Flow("EIP4M0_USERGROUP_SEARCH", SEARCH_FLOW_XML).initial();
Field[] inputs = flow.getInputs();
assertEquals(3, inputs.length, "应解析出 3 个 input 字段");
Field tableName = flow.getInputField("tableName");
assertNotNull(tableName);
assertEquals("java.lang.String", tableName.getType());
assertTrue(tableName.isRequired());
assertEquals("SYS_USERGROUP", tableName.getInitValue(), "initValue 应透传");
}
@Test
@DisplayName("2. 解析 output 字段")
void parseOutputFields() {
Flow flow = new Flow("f", SEARCH_FLOW_XML).initial();
Field[] outputs = flow.getOutputs();
assertEquals(1, outputs.length);
assertEquals("result", outputs[0].getName());
assertEquals("java.util.Map", outputs[0].getType());
}
@Test
@DisplayName("3. 解析 service 节点:beanName/method/args/result")
void parseServiceNode() {
Flow flow = new Flow("f", SEARCH_FLOW_XML).initial();
Node search = flow.getNode("search");
assertNotNull(search);
assertEquals(Node.SERVICE_TYPE, search.getType());
ServiceBean bean = search.getBean();
assertNotNull(bean);
assertEquals("pojoCRUDService", bean.getBeanName());
assertEquals("listSelect", bean.getMethod());
assertEquals(List.of("map", "tableName", "ctx"), bean.getArgs());
assertEquals("result", bean.getResult());
}
@Test
@DisplayName("4. 解析 start 节点的 groovy 脚本(getText 保留脚本体)")
void parseStartScript() {
Flow flow = new Flow("f", SEARCH_FLOW_XML).initial();
Node start = flow.getStart();
assertNotNull(start.getScript());
assertEquals("groovy", start.getScript().getType());
assertTrue(start.getScript().getScrip().contains("def x = 1"),
"CDATA 脚本体应原样保留(dom4j getText)");
}
@Test
@DisplayName("5. 解析 transition 转移并形成有序节点链 Start→search→End")
void parseTransitionsAndNodeOrder() {
Flow flow = new Flow("f", SEARCH_FLOW_XML).initial();
List<Transition> fromStart = flow.getTransitions("Start");
assertEquals(1, fromStart.size());
assertEquals("search", fromStart.get(0).getTo());
List<Node> ordered = flow.getNodes();
assertEquals("Start", ordered.get(0).getId());
assertEquals("search", ordered.get(1).getId());
assertEquals("End", ordered.get(ordered.size() - 1).getId());
}
@Test
@DisplayName("6. 往返序列化:Flow→XML→Flow 结构稳定(BaseFlowConvert)")
void roundTripSerialization() {
Flow flow = new Flow("f", SEARCH_FLOW_XML).initial();
String xml = BaseFlowConvert.convertToXml(flow);
assertNotNull(xml);
assertTrue(xml.contains("pojoCRUDService"));
assertTrue(xml.contains("listSelect"));
Flow reparsed = new Flow("f", xml).initial();
assertEquals(flow.getInputs().length, reparsed.getInputs().length);
assertEquals("listSelect", reparsed.getNode("search").getBean().getMethod());
}
@Test
@DisplayName("7. DefaultFlowHelper 生成查询默认流:非受控 + listSelect service 节点")
void defaultSearchFlow() {
FlowDefinition def = DefaultFlowHelper.getDefaultSearch("SYS_USERGROUP",
"e1000000-0000-0000-0000-000000000003", "用户组");
assertNotNull(def);
assertEquals("SYS_USERGROUP_SEARCH", def.getKey());
assertFalse(def.isControl(), "默认查询流应为非受控(免鉴权)");
Flow flow = ((Flow) def).initial();
assertEquals("listSelect", flow.getNode("search").getBean().getMethod());
}
@Test
@DisplayName("8. DefaultFlowHelper 生成新增默认流:受控 + save service 节点")
void defaultAddFlow() {
FlowDefinition def = DefaultFlowHelper.getDefaultAdd("SYS_USERGROUP",
"e1000000-0000-0000-0000-000000000003", "用户组");
assertEquals("SYS_USERGROUP_ADD", def.getKey());
assertTrue(def.isControl(), "默认新增流默认受控");
Flow flow = ((Flow) def).initial();
ServiceBean bean = flow.getNode("save").getBean();
assertEquals("pojoCRUDService", bean.getBeanName());
assertEquals("save", bean.getMethod());
}
@Test
@DisplayName("9. 空/缺失 flow XML:initial 容错不抛(返回无 input)")
void emptyFlowTolerant() {
Flow flow = new Flow("empty", null).initial();
assertEquals(0, flow.getInputs().length);
assertEquals(0, flow.getOutputs().length);
}
}