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:
124
platform-parity/src/main/resources/bootstrap/bootstrap-flow.sql
Normal file
124
platform-parity/src/main/resources/bootstrap/bootstrap-flow.sql
Normal file
@@ -0,0 +1,124 @@
|
||||
-- ============================================================================
|
||||
-- eip4-platform P1 服务流引擎本地自举 schema —— bootstrap-flow.sql
|
||||
-- ----------------------------------------------------------------------------
|
||||
-- 用途:在本地 eip4m0 库(已先跑 bootstrap-sys.sql)上补建服务流引擎
|
||||
-- (FlowExcuteService/FlowService)运行所需的 SYS_SERVICEFLOW 平台表 +
|
||||
-- 自描述元数据 + 一个最小「查询类」服务流定义,使引擎可在无客户库副本时
|
||||
-- loadFlowDefinition → excute 走通整条执行链(解析 XML → service 节点
|
||||
-- 调 pojoCRUDService.listSelect → 归集 output)。
|
||||
--
|
||||
-- 口径权威来源(已逐一核对源码):
|
||||
-- * 列序 = 客户库 eip3.sys_serviceflow 实际结构(information_schema 核对):
|
||||
-- sys_serviceflow_id varchar(200) PK / displayname varchar(100) /
|
||||
-- contentxml xml / createby,updateby char(36) / createtime,updatetime bigint /
|
||||
-- version int / entityid char(36) / iscontrol int / isactive int / isupdateable int
|
||||
-- * 读路径 = FlowServiceImpl.loadFlowXml:
|
||||
-- pojoCRUDService.loadPOJO(flowKey,"SYS_SERVICEFLOW",null,true) →
|
||||
-- BaseFlowConvert.convertPOToFlow 取 SYS_SERVICEFLOW_ID/DISPLAYNAME/CONTENTXML/
|
||||
-- ENTITYID/ISCONTROL/ISUPDATEABLE。
|
||||
-- * 流 XML 形态 = 客户库真实 *_SEARCH 流(input map+ctx+tableName → service 节点
|
||||
-- pojoCRUDService.listSelect → output result)。
|
||||
--
|
||||
-- 纪律:可重复执行(DROP ... IF EXISTS 开头);表名/列名一律小写;contentxml 本地用 text
|
||||
-- (PG xml 类型对引擎透明,引擎只取字符串;text 便于自举且 listSelect 不解析其内部)。
|
||||
-- ============================================================================
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 0. 清理
|
||||
-- ---------------------------------------------------------------------------
|
||||
DROP TABLE IF EXISTS sys_serviceflow CASCADE;
|
||||
-- 移除可能残留的自举流元数据(可重复执行)
|
||||
DELETE FROM sys_entityattribute WHERE entityid = 'e1000000-0000-0000-0000-000000000008';
|
||||
DELETE FROM sys_entity WHERE sys_entity_id = 'e1000000-0000-0000-0000-000000000008';
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 1. 物理表 SYS_SERVICEFLOW(列与客户库逐列对齐;contentxml 用 text 便于自举)
|
||||
-- ---------------------------------------------------------------------------
|
||||
CREATE TABLE sys_serviceflow (
|
||||
sys_serviceflow_id character varying(200) NOT NULL,
|
||||
displayname character varying(100),
|
||||
contentxml text,
|
||||
entityid character(36),
|
||||
iscontrol integer DEFAULT 1,
|
||||
isupdateable integer DEFAULT 1,
|
||||
isactive integer DEFAULT 1 NOT NULL,
|
||||
createtime bigint,
|
||||
updatetime bigint,
|
||||
createby character(36),
|
||||
updateby character(36),
|
||||
version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (sys_serviceflow_id)
|
||||
);
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 2. 自描述元数据:SYS_SERVICEFLOW 实体 + 属性,使 loadPOJO 可识别
|
||||
-- 实体 id = e1000000-0000-0000-0000-000000000008;统一 ENTITYTYPE 与 bootstrap-sys 一致。
|
||||
-- ---------------------------------------------------------------------------
|
||||
INSERT INTO sys_entity
|
||||
(sys_entity_id, name, description, tablename, entitytype, isview, ischangelog,
|
||||
accesslevel, tabletype, isactive, createtime, updatetime, createby, updateby, version)
|
||||
VALUES
|
||||
('e1000000-0000-0000-0000-000000000008', '服务流', '服务流定义主表', 'SYS_SERVICEFLOW',
|
||||
'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0);
|
||||
|
||||
INSERT INTO sys_entityattribute
|
||||
(sys_entityattribute_id, entityid, columnname, displayname, referenceid, ismandatory, isreadonly,
|
||||
iskey, isidentifier, iscombidentifier, isentitydisplay, entitydisplayseq, fieldlength,
|
||||
isactive, createby, updateby, version)
|
||||
VALUES
|
||||
('a1000000-0000-0000-0000-000000000801', 'e1000000-0000-0000-0000-000000000008', 'SYS_SERVICEFLOW_ID', '主键', 'NVARCHAR', 1, 1, 1, 0, 0, 0, 1, 200, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000802', 'e1000000-0000-0000-0000-000000000008', 'DISPLAYNAME', '显示名', 'NVARCHAR', 0, 0, 0, 0, 0, 1, 2, 100, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000803', 'e1000000-0000-0000-0000-000000000008', 'CONTENTXML', '流定义XML', 'NVARCHAR', 0, 0, 0, 0, 0, 0, 3, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000804', 'e1000000-0000-0000-0000-000000000008', 'ENTITYID', '实体ID', 'CHAR', 0, 0, 0, 0, 0, 0, 4, 36, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000805', 'e1000000-0000-0000-0000-000000000008', 'ISCONTROL', '受控', 'INTEGER', 0, 0, 0, 0, 0, 0, 5, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000806', 'e1000000-0000-0000-0000-000000000008', 'ISUPDATEABLE', '可更新', 'INTEGER', 0, 0, 0, 0, 0, 0, 6, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000807', 'e1000000-0000-0000-0000-000000000008', 'ISACTIVE', '是否有效', 'BOOLEAN', 0, 0, 0, 0, 0, 0, 7, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000808', 'e1000000-0000-0000-0000-000000000008', 'CREATETIME', '创建时间', 'TIME', 0, 0, 0, 0, 0, 0, 8, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000809', 'e1000000-0000-0000-0000-000000000008', 'UPDATETIME', '更新时间', 'TIME', 0, 0, 0, 0, 0, 0, 9, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-00000000080a', 'e1000000-0000-0000-0000-000000000008', 'CREATEBY', '创建人', 'NVARCHAR', 0, 0, 0, 0, 0, 0, 10, 36, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-00000000080b', 'e1000000-0000-0000-0000-000000000008', 'UPDATEBY', '更新人', 'NVARCHAR', 0, 0, 0, 0, 0, 0, 11, 36, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-00000000080c', 'e1000000-0000-0000-0000-000000000008', 'VERSION', '版本', 'INTEGER', 0, 0, 0, 0, 0, 0, 12, 0, 1, 'ADMIN', 'ADMIN', 0);
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 3. 最小「查询类」服务流定义:对 bootstrap-sys 种入的 SYS_USERGROUP 做 listSelect。
|
||||
-- 形态对齐客户库真实 *_SEARCH 流:input(map,ctx,tableName)→service 节点
|
||||
-- pojoCRUDService.listSelect(map,tableName,ctx)→output result。
|
||||
-- iscontrol=0(非受控,免 FlowPrivilegeService 鉴权)。
|
||||
-- 流 key = EIP4M0_USERGROUP_SEARCH(本地自造,不与客户库流冲突)。
|
||||
-- ---------------------------------------------------------------------------
|
||||
INSERT INTO sys_serviceflow
|
||||
(sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable,
|
||||
isactive, createtime, updatetime, createby, updateby, version)
|
||||
VALUES
|
||||
('EIP4M0_USERGROUP_SEARCH', '用户组查询(自举)',
|
||||
$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="usergroup-search-start"><![CDATA[import com.dsasp.server.common.dataDic.service.POJOCRUDService;
|
||||
if(!map.containsKey(POJOCRUDService.ORDER)){
|
||||
map.put(POJOCRUDService.ORDER, "order by P.NAME ASC");
|
||||
}
|
||||
]]></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>$XML$,
|
||||
'e1000000-0000-0000-0000-000000000003', 0, 1, 1, 0, 0, 'ADMIN', 'ADMIN', 0);
|
||||
Reference in New Issue
Block a user