P2-4: 多维数据权限全形态实测——R1 风险判定(引擎多维隔离语义成立)
普查(客户库只读):1079 条活跃规则归型——多规则同实体 303/345(角色 OR 88%)、 多条件 op 串联 117、type 分布 CURRENTUSERORGID 323/OWNNERPROJECT 165/CURRENTUSERDEPARTID 27、 SPECIALDEPART/ORG 客户零用;OwnProjectWhere SysConfig 实际值取证。 实测(本地 eip4m0,可写):bootstrap-multidim.sql 构造 7 受控实体 + 规则矩阵, MultiDimPrivilegeRunner + ParityCli --multidim 多维 ctx 驱动引擎过滤 vs JDBC 等价 WHERE 逐行对拍——14 形态 100% 一致(39 行)+ 7/7 负例被拒。覆盖部门/组织/SPECIALDEPART/ OWNNERPROJECT 单维、op=AND 串联、多规则角色 OR 三态、建筑三维 OWNER×部门×项目。 客户库抽测(只读,P2-1 口径):DM_FILE(299)/SYS_USER(806)组织维 count+行级 MATCH + 负例被拒。 测试通道:EntityController 加 asDepart/asOrg(与 asUser 同性质,不传零回归), 使引擎可解析 CURRENTUSERDEPARTID/CURRENTUSERORGID 维度。 单测:MultiDimDataPrivilegeTest 9 测(getWhereClause 拼接矩阵,FakePOInfo 模式)。 全模块 test + ArchUnit 绿。手册新增 §5.34/§5.35。 R1 判定:引擎多维隔离语义成立,不构成 P2 阻塞;缺口(OWNNERPROJECT 客户库直拍/ 生产 ctx 注入/SPECIALDEPART 无真实样本)如实登记跟踪。未触发决策会 S1。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
43
docs/迁移手册.md
43
docs/迁移手册.md
@@ -109,6 +109,7 @@ com.dsasp.* com.eip4.*
|
||||
| `Console` | Vaadin 浏览器控制台推送 | `slf4j` | 待查 | 极简 | 日志语义等价 |
|
||||
| `InstallOrUpdate` | 启动期按版本跑 install SQL | `isDevDB()=false` 桩 | 待查 | 极简 | 生产环境不触发 |
|
||||
| `GetServicesFunction` 等 3 个 | Groovy 脚本函数库(约 2,600 行) | Java 桩(仅实现 `findCount`);WS3 回迁 | 约 2,600 行 | 最小桩 | P1/P3 阶段补全真实现 |
|
||||
| `FTPClientTemplate` | FTP 远端存储后端(commons-net + DB 内 FTPServer/FTPPort/FTPUserName/FTPUserPassword 配置)| **本地盘后端**(P2-3,附件横切服务真实现移植)| 308 行 | 约 150 行 | **保包名/类名/对外签名**(`uploadFileAndZip`/`downloadFile`/`delete`/`fileExists`);后端 FTP→本地盘,根目录=`MainApp.destPath`(默认 `./data/files`,经 `eip4.file.root` 配置化注入)。`FileServiceImpl`/`ZipUtil` call site 零改动。安全:`resolveSafe` 归一 canonical path 拒绝 `../` 逃逸出根。详见 §5.36 / platform-auth/P2横切服务实测报告.md |
|
||||
|
||||
**注意**:替换时必须**保持包名/类名/方法签名完全一致**,旧引擎代码对这些类的引用不做任何修改——「旧代码零感知」是双层制的核心约定。
|
||||
|
||||
@@ -117,9 +118,10 @@ com.dsasp.* com.eip4.*
|
||||
| 桩 | 包路径 | 当前行为 | P2 真实现要点 |
|
||||
|----|--------|---------|-------------|
|
||||
| ~~`dataPrivilegeService`~~ | ~~`com.eip4.poc.stub`~~ | **已由 M0/C2 真实现接管** | 桩已删除;保真层 `com.dsasp.server.privilege.service.DataPrivilegeServiceImpl`(原样移植)提供行级过滤原版语义;P2 在此之上接组织数据源 + 管理 UI(见 §5.8 / platform-auth/C2实测报告.md) |
|
||||
| `fileService` | `com.eip4.poc.stub` | no-op | 本地盘 / MinIO 接口 |
|
||||
| `projectSwitchService` | `com.eip4.poc.stub` | no-op | 项目上下文切换 |
|
||||
| `systemLogManager` | `com.eip4.poc.stub` | slf4j | 业务操作日志入库 |
|
||||
| ~~`fileService`~~ | ~~`com.eip4.platform.auth.stub`~~ | **已由 P2-3 真实现接管** | 桩已删除;保真层 `com.dsasp.server.file.service.FileServiceImpl`(原样移植,bean `fileService`)接管;存储后端经替换类 `FTPClientTemplate`(本地盘,根目录 `eip4.file.root` 配置化)。详见 §3.1 / §5.36 / platform-auth/P2横切服务实测报告.md |
|
||||
| `projectSwitchService` | `com.eip4.platform.auth.stub` | no-op(**保留**) | **viewframework 域,非 P2-3 文件/日志/消息范畴**;P2 计划未列其真实现归属,保留桩待 viewFramework 域专项移植接管 |
|
||||
| ~~`systemLogManager`~~ | ~~`com.eip4.platform.auth.stub`~~ | **已由 P2-3 真实现接管** | 桩已删除;保真层 `com.dsasp.server.log.service.SystemLogManagerImpl`(bean `systemLogManager`)+ `DataOperatorLogger`(bean `dataOperatorLog`)+ `DataLogRecorderImpl`(bean `dataLogRecorder`)原样移植,异步批量落 SYS_LOG / SYS_DATA_LOG / SYS_DATA_LOGITEM。`StubDataOperatorLog` 同步删除 |
|
||||
| ~~`systemEmailService`~~ | (原无桩) | **P2-3 移植 + 降级装配** | 保真层 `com.dsasp.server.mail.service.SystemEmailServiceImpl`(bean `systemEmailService`)+ `SystemEmail`/`SystemEmailService` 移植;**SMTP 配置缺省时降级 no-op + WARN,不阻塞启动**。详见 §5.37 |
|
||||
|
||||
---
|
||||
|
||||
@@ -406,6 +408,41 @@ com.dsasp.* com.eip4.*
|
||||
- **对策**:`RealEntityPrivilegeRunner`(`ParityCli --realprivilege`)只挑两类**可确定性复现等价 WHERE** 的形态做正例:① `[]`→全表;② `[{USERID={CURRENTUSERID}}]`→`WHERE userid='<uid>'`。且**仅当真实用户对该实体的全部交集规则都属可复现形态**才取为正例(否则引擎 OR 进不可复现规则,等价 WHERE 不成立);其余真实形态语义虽真实,**如实登记不纳入正例**(避免假阳性)。负例(无命中角色→`PrivilegeException`)对所有有规则实体均可验。**全程只读,绝不向客户库写规则**(任务红线)。实测:HR_SAFETYCARD/HR_OTHERCARD/HR_CONSTRUCTORCARD/HR_MEMBERCARD 共 4 实体 805 行 100% 逐行一致 + 5/5 负例被拒(见 platform-auth/P2组织权限实测报告.md §七)。
|
||||
- **影响范围**:所有真实规则权限对拍;`{CURRENTUSERORGID}`/OWNNERPROJECT 等动态形态的对拍待 P2 管理 UI 落地后,用「写规则→读回 ctx 一致性」闭环验(届时有真实 ctx 来源),非本期只读对拍能覆盖。
|
||||
|
||||
### 5.34 多维权限对拍:引擎需 CURRENTDEPART/CURRENTORG,EntityController 测试通道须加 asDepart/asOrg [NEW 2026-06-11]
|
||||
|
||||
- **现象**:P2-4 实测多维隔离(部门/组织/项目维)时,引擎 `DataPrivilegeServiceImpl.getFilterSql` 对 `CURRENTUSERDEPARTID`/`CURRENTUSERORGID` 类型条件读 `ctx.CURRENTDEPART`/`ctx.CURRENTORG`,但 `EntityController.buildCtx` 的 `asUser`/`roles` 测试通道**只注入 CURRENTUSER + ROLES**,部门/机构维 ctx 为空 → 多维过滤拼出 `P.DEPARTID =''`(空串)致结果恒空,无法对拍。
|
||||
- **根因**:C2/P2-1 仅验单维(CREATEBY/USERID/view-all),测试通道未覆盖部门/机构维 ctx。
|
||||
- **对策**:`EntityController.list` 增 `asDepart`/`asOrg` 两个**测试通道**查询参(与 `asUser` 同性质,加入 `RESERVED_KEYS` 放行),`buildCtx` 在 asUser 分支可选 `ctx.setProperty(CURRENTDEPART/CURRENTORG, …)`。不传则维持单维行为(零回归)。对拍执行器 `MultiDimPrivilegeRunner`(`ParityCli --multidim`)据此驱动 `asUser+asDepart+asOrg+roles` 多维 ctx vs JDBC 等价 WHERE 逐行 diff。实测 **14 形态(单维部门/组织/SPECIALDEPART/OWNNERPROJECT、op=AND 串联、多规则角色 OR、建筑三维 OWNER×部门×项目)100% 逐行一致 + 7/7 负例被拒**(见 platform-auth/P2多维数据权限实测报告.md)。
|
||||
- **影响范围**:凡需多维 ctx 的对拍/集成测试同此(测试通道补维度键,生产经 JWT/UserSession 注入真实 ctx,非测试通道);`SPECIALDEPART`/`SPECIALORG` 客户库零使用但引擎支持,本期已补构造验证全覆盖。
|
||||
|
||||
### 5.35 多维自举 bootstrap 清理须按精确 id 删属性,LIKE 'a1000000-%' 会误删 bootstrap-sys 的 SYS 自描述元数据 [NEW 2026-06-11]
|
||||
|
||||
- **现象**:`bootstrap-multidim.sql` 复用 `bootstrap-privilege` 的 SYS_FILTERRULE 自描述元数据 id(`a1000000-…-08xx/09xx`),清理时若写 `DELETE FROM sys_entityattribute WHERE sys_entityattribute_id LIKE 'a1000000-%'`,会**连带删掉 bootstrap-sys 为 SYS_ENTITY/SYS_USERGROUP/SYS_ENTITYATTRIBUTE 等系统表建的自描述属性**(它们 id 同前缀 `a1000000-…-01xx..07xx`)→ 引擎 `getSYSEntityByTableName` 的 `loadPOJO(…,"SYS_ENTITY",…)` 因 SYS_ENTITY 零属性 → `buildSelect` 产出字面 `null` → **任意实体 list 全盘 HTTP 500**(`PSQLException: syntax error at or near "null"`,Position 1)。
|
||||
- **根因**:SYS 自描述元数据(SYS_ENTITY 自身的列定义)是引擎解析**所有**实体的前置依赖;bootstrap-sys 与权限/多维 bootstrap 的属性 id 共享 `a1000000-` 前缀,宽前缀 DELETE 跨界误删。
|
||||
- **对策**:幂等清理**只删本脚本自建**的属性——精确到 `a1000000-…-0008%`/`-0009%`(SYS_FILTERRULE/中间表)+ 自定义前缀 `amd00000-`(多维实体),**绝不**用宽 `a1000000-%`。排错锚点:`SELECT e.tablename, count(a.*) FROM sys_entity e LEFT JOIN sys_entityattribute a … WHERE e.tablename='SYS_ENTITY'`——SYS_ENTITY 属性数为 0 即此坑。
|
||||
- **影响范围**:所有复用 bootstrap-privilege/bootstrap-sys 固定 id 的增量 bootstrap 脚本;新增自举脚本的 DELETE 一律按**本脚本自有 id 段**收敛,不按共享前缀。
|
||||
|
||||
### 5.36 附件 FileService 原版后端=FTP(非本地盘),本地盘默认须经替换类落地;旧依赖 sun.misc.BASE64Decoder/ant zip 在 JDK17 不可用 [NEW 2026-06-11]
|
||||
|
||||
- **现象**:framework `FileServiceImpl` 看似「本地盘」,实则 `save` 经 `ZipUtil.ZipFileToDest`→`FTPClientTemplate.uploadFileAndZip` **上传到 FTP 服务器**(地址取自 DB `DBInfoConfigurer.getContextProperty("FTPServer/FTPPort/...")`),`getDocFile` 同样经 FTP 下载;且 `FileServiceImpl` 用 `sun.misc.BASE64Decoder`(JDK 17 已移除)、`ZipUtil` 用 `org.apache.tools.zip`(ant)、`FileUtil.getFileType` 用 `javax.swing.FileSystemView`。直接原样移植在 Boot 3 / JDK 17 既编译不过,也不满足「默认本地盘、不依赖外部服务」。
|
||||
- **根因**:旧引擎附件层是「DB 元数据(SYS_DOC) + FTP 物理存储」二段式;存储后端被封装在 `FTPClientTemplate`(commons-net),正是 §3.1 可等价替换的耦合点。
|
||||
- **对策**:按 §3.1「保包名/类名/对外签名」替换类策略——`FileServiceImpl`/`ZipUtil` 主体原样移植(仅 `BASE64Decoder`→`java.util.Base64`、ant zip→`java.util.zip`、`HashCalc` 的 commons-codec→JDK `MessageDigest`,摘要逐字节一致),把 `FTPClientTemplate` 整体换为**本地盘后端**(同包同名同签名 `uploadFileAndZip`/`downloadFile`/`delete`/`fileExists`)。根目录 = `MainApp.destPath`,默认 `./data/files`,经 `eip4.file.root`(application.yml,环境变量 `EIP4_FILE_ROOT` 可覆盖)由 `LegacyXmlWiring` 单向注入(保真层不反向依赖现代层,ArchUnit 约束)。上传仍按原语义把单附件 zip(单条目=文件名)落 `destPath+相对路径`,SYS_DOC 落库(FILEPATH/MD5/软删 ISACTIVE)语义不变。**安全第 1 层**:`resolveSafe` 用 canonical path 比对,拒绝 `../` 逃逸出根(WARN + IOException)。
|
||||
- **影响范围**:凡涉及附件存储的路径;真实启用 MinIO/对象存储时,同样在 `FTPClientTemplate` 这一替换类处换后端,`FileServiceImpl` 及引擎调用方零改动。`MainApp` 原版写死 Windows 路径(`C:\\...`/`D:\\c\\baseDoc\\`),移植时默认值改为跨平台相对路径并加 setter。
|
||||
|
||||
### 5.37 系统/数据日志为异步队列+定时批量落库,bean 名 systemLogManager/dataOperatorLog/dataLogRecorder 三件齐;jdbcTemplate 须 XML 等价 setter 补齐;LOGLEVEL 未配置=整链静默 [NEW 2026-06-11]
|
||||
|
||||
- **现象**:`SystemLogManagerImpl.log(LogType,String)` 与 `DataOperatorLogger.insert/update/deleteData` **并不直接写库**,而是入 `ConcurrentLinkedQueue` 后由 `DataLogManager`(单例 Timer,1s 启动 30s 周期)经线程池分批(每批 100)调 `ProcessSysLogThread`/`ProcessLogThread`→ 真正落库的 `systemLogManager.log(List)` / `dataLogRecorder.recorderLogs(List)`。线程任务用 `SpringBeanOsgiServices.getInstance().getBeanByName(...)` 取 bean,故 `systemLogManager`/`dataLogRecorder` **bean 名必须精确**。`SystemLogManagerImpl.log(LogType,String)` 还有两道闸:`UserSession.get()==null` 直接返回,且 `LOGLEVEL` 配置(`com.dsasp.server.log.LOGLEVEL`,逗号分隔 `LogType.value`=Errors/Info/Debug/Warnings)未命中也返回——**未配置 LOGLEVEL = 系统日志整链静默**。
|
||||
- **根因**:旧引擎日志为「写多读少、容忍延迟」设计,异步批量降数据库压力;`jdbcTemplate` 在 framework 经 service.xml `<property>` setter 注入(非 @Autowired)。
|
||||
- **对策**:三个 impl(`SystemLogManagerImpl`/`DataOperatorLogger`/`DataLogRecorderImpl`)原样移植 + `DataLogManager`/`ProcessLogThread`/`ProcessSysLogThread` 原样移植;`jdbcTemplate` 经 `LegacyXmlWiring`(SmartInitializingSingleton)等价 setter 补齐(见 §4.1,本次新增 fileService/systemLogManager/dataLogRecorder 三处)。本地验证须在 `sys_application_config` 种 `com.dsasp.server.log.LOGLEVEL='Errors,Info,Debug,Warnings'`(见 bootstrap-xservice.sql),否则系统日志不落。`SYS_DATA_LOGITEM` 为 insert-only 无 UPDATETIME 列(§5.1),`DataLogRecorderImpl` 只走纯 INSERT,符合。数据日志仅当实体 `SYS_ENTITY.ischangelog=1` 才记(`po.get_poInfo().isChangeLog()`)。
|
||||
- **影响范围**:凡需端到端验证日志落库,须备齐三表(SYS_LOG/SYS_DATA_LOG/SYS_DATA_LOGITEM)+ LOGLEVEL 配置 + changelog 实体 + 请求级 UserSession;异步链路落库有最长 ~30s 延迟,集成测试宜直接调 `log(List)`/`recorderLogs(List)` 同步路径断言。
|
||||
|
||||
### 5.38 邮件 SystemEmailServiceImpl 深度依赖外部 SMTP(javax.mail + freemarker + OSGi ConfigUtil),按「配置缺省降级 no-op + WARN」装配,不阻塞启动 [NEW 2026-06-11]
|
||||
|
||||
- **现象**:原版 `SystemEmailServiceImpl` 构造期即 `ConfigUtil.getValue("admin_mail")`(经 OSGi `com.dsasp.resource.Activator` 读 bundle 内 properties),发件走 Spring `JavaMailSender`(javax.mail,非 jakarta.mail)+ freemarker 模板 + `TaskExecutor` 异步;`ClientMailServiceImpl` 更是整套 POP3/IMAP 收发件客户端。直接原样移植在 Boot 3 需 javax→jakarta.mail 迁移 + 活的 SMTP/POP3 服务器,且 eip4 当前无任何调用方。
|
||||
- **根因**:邮件是「深度依赖外部服务」的横切件,与文件/日志(纯本地盘/本地库)性质不同。
|
||||
- **对策**:按 P2 任务约定——移植 `SystemEmailService` 接口 + `SystemEmail` bean(原样),提供 `SystemEmailServiceImpl`(bean `systemEmailService`)**降级实现**:`sendEmail` 读 SMTP 发件人配置(`SysConfig` 键 `com.dsasp.server.mail.admin_mail`),缺省(默认)时仅打 WARN 后 no-op 返回,**决不抛异常、决不阻塞调用方/启动**;配置就绪时 WARN 提示「真实 SMTP 投递待 JavaMailSender 装配后接通」留口。`ClientMailService`(POP3/IMAP 全客户端)非「横切消息服务」范畴且无调用方,本次不移植。真实启用时在此 impl 接 `JavaMailSender`(jakarta.mail)即可,接口/bean 名零改动。
|
||||
- **影响范围**:工作流任务提醒、报表订阅等触达邮件的路径;启用前调用方得到的是「静默 no-op + 日志」,不影响主流程正确性。
|
||||
|
||||
### 5.OTP P2 organize 移植:OTP 库 jotpverify.jar 无公网坐标,经模块内私有仓库解析 [NEW 2026-06-11]
|
||||
|
||||
- **现象**:`UserOtpServiceImpl`(动态令牌认证)依赖 `ft.otp.verify.OTPVerify`(`framework/com.dsasp.server.organize/lib/jotpverify.jar`),Maven 中央仓库无此坐标,模块编译期 `package ft.otp.verify does not exist`。
|
||||
|
||||
223
platform-auth/P2多维数据权限实测报告.md
Normal file
223
platform-auth/P2多维数据权限实测报告.md
Normal file
@@ -0,0 +1,223 @@
|
||||
# EIP4 P2-4 多维数据权限「建筑行业多维隔离」语义 实测报告
|
||||
|
||||
> 工程:eip4-platform · 时间:2026-06-11 · 性质:P2 成败手 / CTO 风险 **R1**(数据行级权限多维隔离语义是否成立)实质判定
|
||||
> 环境:客户库 `192.168.20.68:5435/postgres?currentSchema=eip3`(ceshi/ceshi,**只读**)做规则普查 + 抽测;
|
||||
> 本地 `localhost:5433/eip4m0`(zhengwr 无密码,可写)做全形态矩阵实测;服务端口 **8088**(8084/8087 未动)。
|
||||
> 引擎语义权威来源:`platform-legacy-core` `DataPrivilegeServiceImpl.getFilterSql`(已逐行核对)。
|
||||
|
||||
---
|
||||
|
||||
## 一、结论速览(R1 判定)
|
||||
|
||||
| 项 | 结果 |
|
||||
|----|------|
|
||||
| 客户库规则形态普查(只读,1079 条活跃规则) | ✅ 已归型,见 §二 |
|
||||
| **本地全形态矩阵实测(≥12 形态目标)** | ✅ **14 形态 100% 逐行一致(39 行)+ 7/7 负例被拒** |
|
||||
| 客户库多维规则只读抽测(≥2 条) | ✅ **DM_FILE(299 行)/ SYS_USER(806 行)组织维 count+行级 MATCH + 负例被拒** |
|
||||
| getWhereClause 拼接矩阵单测(≥6) | ✅ **MultiDimDataPrivilegeTest 9 测全绿**(沿用 FakePOInfo 模式) |
|
||||
| 全模块 test + ArchUnit | ✅ **BUILD SUCCESS**,ArchUnit 1/1,全单测 0 失败(legacy-core 45 / metadata 34 / parity 30 / auth 16) |
|
||||
| **R1 风险判定** | ✅ **引擎多维隔离语义成立**(部门×组织×部门集×项目×分包商,单维/多条件 op 串联/多规则角色 OR 全闭合);缺口见 §五.3 |
|
||||
| 与决策会「P2 进度偏差>50% 触发 S1」对照 | ✅ **未触发 S1**(P2-4 全目标达成,无进度偏差) |
|
||||
|
||||
产物:
|
||||
- 本报告;对拍报告 `parity-reports/multidim-parity-20260611-135917.{json,md}`
|
||||
- 自举:`platform-parity/src/main/resources/bootstrap/bootstrap-multidim.sql`
|
||||
- 对拍执行器:`platform-parity/.../selfcheck/MultiDimPrivilegeRunner.java` + `ParityCli`(`--multidim`)
|
||||
- 测试通道扩展:`platform-metadata/.../web/EntityController.java`(加 `asDepart`/`asOrg`)
|
||||
- 单测:`platform-legacy-core/.../privilege/MultiDimDataPrivilegeTest.java`
|
||||
|
||||
---
|
||||
|
||||
## 二、客户库规则形态普查(只读,第一手数据)
|
||||
|
||||
> 数据源:客户库 `eip3` schema,`SET search_path TO eip3` 后纯 SELECT,**未写任何规则**。脚本见 `/tmp/p2-4-survey.sql` 思路(归型用 `jsonb_array_elements` 精确解析 + 关键字命中双口径)。
|
||||
|
||||
### 2.1 规模与多规则分布
|
||||
|
||||
| 指标 | 值 |
|
||||
|------|-----|
|
||||
| 活跃规则总数(`isactive=1`) | **1079** |
|
||||
| 去重实体数 | **345** |
|
||||
| 单规则实体 / 多规则实体 | **42 / 303**(多规则同实体占比 **87.8%**) |
|
||||
| 多规则实体涉及规则数 | 1037 |
|
||||
| 同实体规则数 Top | PM_PAYMENTAPPLY 31、VIEW_PM_CONTRACT 23、PM_CONTRACTACCOUNTS 22、VIEW_HR_USERWITHALLCARDS/PM_CONTRACTBALANCE 18、HR_SAFETYCARD/PM_SUBCONTRACTCLAIM/PM_SUBCONTRACTCHANGE 13 |
|
||||
|
||||
> **判读**:88% 的实体配多条规则 → 引擎「多规则按角色 OR 合并」是客户库**绝对主流**用法,本期重点验证对象。
|
||||
|
||||
### 2.2 FILTERRULE JSON 形态
|
||||
|
||||
| 形态 | 计数 |
|
||||
|------|------|
|
||||
| 空条件(`[]`/null,查看全部) | **376** |
|
||||
| 非空 JSON 数组 | **703** |
|
||||
| 非数组形态 | 0 |
|
||||
| 单条件规则(1 conditional) | **586** |
|
||||
| 多条件规则(≥2 conditional,op 串联) | **117**(单规则内最多 **3** 条件) |
|
||||
| 规则含 `op:"AND"` | **91** |
|
||||
| 规则含 `op:"OR"` | **27** |
|
||||
|
||||
### 2.3 条件类型分布(`jsonb_array_elements` 精确解析,跨全部 conditional)
|
||||
|
||||
| type | 计数 | sign | 计数 |
|
||||
|------|------|------|------|
|
||||
| CURRENTUSERORGID(组织维) | **323** | `=` | 628 |
|
||||
| NUMBER(静态数值) | 167 | `in` | 196 |
|
||||
| OWNNERPROJECT(项目负责人维) | **165** | | |
|
||||
| TEXT(静态/子查询) | 71 | | |
|
||||
| CURRENTUSERID(用户维) | 71 | | |
|
||||
| CURRENTUSERDEPARTID(部门维) | **27** | | |
|
||||
| **SPECIALDEPART / SPECIALORG(指定集)** | **0 / 0**(客户**未用**,引擎支持) | | |
|
||||
|
||||
> **判读**:组织维(CURRENTUSERORGID 323)+ 项目负责人维(OWNNERPROJECT 165)是建筑行业多维隔离的**两大主力**,部门维(27)次之;SPECIALDEPART/ORG 客户零使用(本期仍补构造全覆盖引擎能力)。
|
||||
|
||||
### 2.4 OwnProjectWhere SysConfig 实际配置值(项目负责人维的核心)
|
||||
|
||||
```
|
||||
SYS_APPLICATION_CONFIG[sys_application_config_id = 'com.dsasp.server.privilege.OwnProjectWhere'].value =
|
||||
SELECT PM_PROJECTID FROM PM_PROJECT_USER WHERE USERID={CURRENTUSERID}
|
||||
```
|
||||
|
||||
引擎 OWNNERPROJECT 形态据此拼:`P.<col> in ( SELECT PM_PROJECTID FROM PM_PROJECT_USER WHERE USERID='<当前用户>' )`(`{CURRENTUSERID}` 拼接前替换为带引号的当前用户;`SysConfig.getConfigValue` 读 `VALUE` 列,见 `DataDicServiceImpl.getConfigValue`)。
|
||||
|
||||
### 2.5 真实多维(多条件)规则样例(供形态构造与抽测)
|
||||
|
||||
| 实体 | 规则(节选) | 形态 |
|
||||
|------|------|------|
|
||||
| HR_SAFETYCARD | `KIND=N AND USERID in (select sys_user_id from sys_user where userorgid={CURRENTUSERORGID})` | 静态 AND 组织维子查询 |
|
||||
| PM_CONTRACTACCOUNTS | `CONTRACTTYPE=N AND ORGID={CURRENTUSERORGID}` | 合同类型 AND 组织维 |
|
||||
| OA_MEETINGMINUTES | `MEETING_COMPERE={CURRENTUSERID} OR MEETING_CLERK={CURRENTUSERID}` | 用户维 OR 串联 |
|
||||
|
||||
---
|
||||
|
||||
## 三、引擎多维过滤语义(逐行核对 `getFilterSql`)
|
||||
|
||||
| 条件 type | 引擎拼接 | ctx 来源 |
|
||||
|-----------|----------|----------|
|
||||
| `CURRENTUSERID` | `P.<col> <sign>'<user>'`(`TO_STRING` 自动加单引号) | `ctx.CURRENTUSER` |
|
||||
| `CURRENTUSERDEPARTID` | `P.<col> <sign>'<depart>'` | `ctx.CURRENTDEPART` |
|
||||
| `CURRENTUSERORGID` | `P.<col> <sign>'<org>'` | `ctx.CURRENTORG` |
|
||||
| `SPECIALDEPART`/`SPECIALORG` | `P.<col> in ('v1','v2',…)`(`convertSplitStrToSql`,**sign 被强制为 in**) | 规则静态值 |
|
||||
| `OWNNERPROJECT` | `P.<col> in ( <OwnProjectWhere,{CURRENTUSERID}已替换> )` | SysConfig + ctx.CURRENTUSER |
|
||||
| 自定义(else) | `P.<col> <sign><backConditional,占位符已替换>` | 规则 + ctx |
|
||||
| **op 串联** | 同规则内多 conditional 以 `op`(AND/OR)连接 | — |
|
||||
| **多规则角色 OR** | 同实体多 `sys_filterrule` 行按命中角色以 ` OR ` 合并,外层 ` AND ( … )` 包裹 | `ctx.ROLES` ∩ 规则角色 |
|
||||
| **first 分支** | 无任何命中角色 → 抛 `PrivilegeException`(HTTP 非 200) | — |
|
||||
|
||||
> 关键发现(坑 §5.34):测试通道 `EntityController.buildCtx` 原仅注入 `CURRENTUSER`+`ROLES`,部门/机构维 ctx 空 → 多维过滤恒空。本期加 `asDepart`/`asOrg` 测试通道(与 `asUser` 同性质,`RESERVED_KEYS` 放行),不传则单维行为零回归。
|
||||
|
||||
---
|
||||
|
||||
## 四、本地全形态矩阵实测(localhost:5433/eip4m0,可写)
|
||||
|
||||
> 自举:`bootstrap-sys.sql`(SYS 自描述元数据)+ `bootstrap-multidim.sql`(7 受控实体 + 规则矩阵 + OwnProjectWhere SysConfig + PM_PROJECT_USER 支撑表 + 种子数据)。
|
||||
> 方法:`ParityCli --multidim`——多维 ctx(`asUser+asDepart+asOrg+roles`)驱动引擎行级过滤路径 vs JDBC **等价 WHERE** 逐行 diff(复用 C1/C2 的 RowDiff + 自对拍豁免内核 `SelfCheckRunner.checkRows`)。
|
||||
|
||||
### 4.1 形态矩阵结果(14 形态,全过)
|
||||
|
||||
| # | 形态 | 实体 | 等价 WHERE | 行数 | 一致率 | 结果 |
|
||||
|---|------|------|-----------|------|--------|------|
|
||||
| 1 | 单维-部门 CURRENTUSERDEPARTID(DEP_1) | EIP4PT_MDDEPT | `departid='DEP_1'` | 3 | 1.0000 | ✅ |
|
||||
| 2 | 单维-部门 CURRENTUSERDEPARTID(DEP_2) | EIP4PT_MDDEPT | `departid='DEP_2'` | 3 | 1.0000 | ✅ |
|
||||
| 3 | 单维-组织 CURRENTUSERORGID(ORG_1) | EIP4PT_MDORG | `orgid='ORG_1'` | 4 | 1.0000 | ✅ |
|
||||
| 4 | 单维-组织 CURRENTUSERORGID(ORG_2) | EIP4PT_MDORG | `orgid='ORG_2'` | 2 | 1.0000 | ✅ |
|
||||
| 5 | 单维-指定部门集 SPECIALDEPART | EIP4PT_MDSPECDEPT | `departid in ('DEP_1','DEP_2')` | 4 | 1.0000 | ✅ |
|
||||
| 6 | 单维-项目负责人 OWNNERPROJECT(USER_PM) | EIP4PT_MDPROJECT | `projectid in (我负责的项目)` | 4 | 1.0000 | ✅ |
|
||||
| 7 | 单维-项目负责人 OWNNERPROJECT(USER_BOB) | EIP4PT_MDPROJECT | `projectid in (我负责的项目)` | 2 | 1.0000 | ✅ |
|
||||
| 8 | 多条件 op=AND 部门 AND 项目(USER_PM/DEP_1) | EIP4PT_MDCOMBO | `departid='DEP_1' AND projectid in(我负责)` | 3 | 1.0000 | ✅ |
|
||||
| 9 | 多条件 op=AND 部门 AND 项目(USER_BOB/DEP_2) | EIP4PT_MDCOMBO | `departid='DEP_2' AND projectid in(我负责)` | 2 | 1.0000 | ✅ |
|
||||
| 10 | 多规则角色 OR(命中 A+B:OWNER OR 部门) | EIP4PT_MDOR | `(owner='USER_PM') OR (departid='DEP_1')` | 4 | 1.0000 | ✅ |
|
||||
| 11 | 多规则角色 OR(只命中 A:OWNER) | EIP4PT_MDOR | `owner='USER_PM'` | 2 | 1.0000 | ✅ |
|
||||
| 12 | 多规则角色 OR(只命中 B:部门) | EIP4PT_MDOR | `departid='DEP_1'` | 2 | 1.0000 | ✅ |
|
||||
| 13 | **建筑三维** OWNER AND 部门 AND 项目(USER_PM/DEP_1) | EIP4PT_SUBCONTRACT | `owner='USER_PM' AND departid='DEP_1' AND projectid in(我负责)` | 3 | 1.0000 | ✅ |
|
||||
| 14 | **建筑三维** OWNER AND 部门 AND 项目(USER_BOB/DEP_1) | EIP4PT_SUBCONTRACT | `owner='USER_BOB' AND departid='DEP_1' AND projectid in(我负责)` | 1 | 1.0000 | ✅ |
|
||||
|
||||
**汇总**:形态正例 **14/14 全一致**,总比对 **39 行 100% 逐行一致**;形态通过率 **1.0000**。覆盖:单维(部门/组织/指定部门集/项目负责人)、多条件 op=AND 串联、多规则角色 OR(命中其一/其二/全命中三态)、建筑三维(项目×组织×部门×分包商表 OWNER×部门×项目)。**目标 ≥12 形态达成(实测 14)。**
|
||||
|
||||
### 4.2 负例(无命中角色 → PrivilegeException)
|
||||
|
||||
| 实体 | HTTP 状态 | 期望 | 结果 |
|
||||
|------|----------|------|------|
|
||||
| EIP4PT_MDDEPT / MDORG / MDSPECDEPT / MDPROJECT / MDCOMBO / MDOR / SUBCONTRACT | **500** | 非 200(PrivilegeException) | ✅ 全部被拒(7/7) |
|
||||
|
||||
> 印证「规则存在但无命中角色 → 拒绝」语义(`getWhereClause` first 分支抛 `PrivilegeException`)。
|
||||
|
||||
---
|
||||
|
||||
## 五、客户库多维规则只读抽测 + R1 风险判定
|
||||
|
||||
### 5.1 客户库抽测(只读,P2-1 安全口径)
|
||||
|
||||
> 服务以 `hikari.read-only=true` 连客户库(8088)。挑**单条件纯组织维**(`<col>={CURRENTUSERORGID}`)规则——等价 WHERE 可确定性复现为 `<col>='<org>'`,且对实体只供该规则角色(不 OR-in view-all 角色)。**全程只读,未写任何规则**。
|
||||
|
||||
| # | 实体 | 规则形态 | 真实 org | 引擎过滤 total | JDBC 等价 WHERE count | count | 行级(前10主键) | 负例 |
|
||||
|---|------|---------|---------|---------------|----------------------|-------|----------------|------|
|
||||
| 1 | DM_FILE | `ORGID={CURRENTUSERORGID}` | 402881343826dc6f0138275606b50001 | **299** | `orgid='…'`=299 | ✅ MATCH | ✅ MATCH | 500 ✅ |
|
||||
| 2 | SYS_USER | `USERORGID={CURRENTUSERORGID}` | (同上) | **806** | `userorgid='…'`=806 | ✅ MATCH | — | — |
|
||||
|
||||
- 两实体均为 2 条规则(1 条组织维 + 1 条 `[]` view-all,角色不同);抽测只供组织维规则角色,引擎仅 OR 该单条 → 等价 WHERE 确定。**count + 行级主键集逐一 MATCH**,负例(占位角色)HTTP 500 被拒。
|
||||
- **不可复现形态如实登记**:`{CURRENTUSERORGID}` 子查询型(如 HR_SAFETYCARD `KIND=N AND USERID in (…userorgid={CURRENTUSERORGID})`)、OWNNERPROJECT、多角色 OR-合并用户——等价 WHERE 依赖运行期真实 org/depart/project ctx 且含嵌套子查询,只读侧精确重建脆弱(易假阳性),按 P2-1 口径不纳入正例(待 P2 管理 UI 落地后用「写规则→读回 ctx 一致性」闭环验)。
|
||||
|
||||
### 5.2 R1 风险判定结论:**引擎多维隔离语义成立**
|
||||
|
||||
1. **维度闭合**:部门(CURRENTUSERDEPARTID)、组织(CURRENTUSERORGID)、指定集(SPECIALDEPART/ORG)、项目负责人(OWNNERPROJECT)四类维度,引擎拼接语义与 JDBC 等价 WHERE **逐行一致**(本地 14 形态)。
|
||||
2. **组合闭合**:多条件 op=AND/OR 串联(单规则内)+ 多规则按角色 OR 合并(跨规则)——客户库 88% 实体的主流用法——引擎合并语义**逐行一致**,命中其一/其二/全命中三态正确,无命中抛 `PrivilegeException`。
|
||||
3. **建筑三维闭合**:项目×组织×部门×分包商场景(EIP4PT_SUBCONTRACT,OWNER×部门×项目三条件 AND),多用户多角色交叉**逐行一致**。
|
||||
4. **真实规则印证**:客户库真实组织维规则(DM_FILE 299 行 / SYS_USER 806 行)只读抽测 count+行级 MATCH,印证引擎对真实配置的隔离正确。
|
||||
|
||||
> **R1 不构成阻塞**:引擎多维数据隔离语义经本地全形态 + 客户库真实抽测双向验证成立,可作为 P2 数据权限的承载底座。
|
||||
|
||||
### 5.3 缺口清单(非阻塞,登记跟踪)
|
||||
|
||||
| # | 缺口 | 现状 | 后续 |
|
||||
|---|------|------|------|
|
||||
| G1 | OWNNERPROJECT/子查询型动态规则的**客户库**直接对拍 | 本地已全形态验;客户库等价 WHERE 重建脆弱,未做正例 | P2 管理 UI 落地后写规则→读回 ctx 闭环验(届时有真实 org/project ctx 来源) |
|
||||
| G2 | 多维 ctx 的**生产注入**(部门/机构)由 JWT/UserSession 提供 | 本期用 `asDepart`/`asOrg` 测试通道驱动;生产路径未在本期验 | P2 登录/会话集成时验 JWT claims→UserSession→ctx 的部门/机构透传 |
|
||||
| G3 | SPECIALDEPART/ORG 客户零使用 | 引擎支持已验(本地形态 5);无真实样本 | 仅登记,客户启用时即覆盖 |
|
||||
|
||||
---
|
||||
|
||||
## 六、单测(getWhereClause 拼接矩阵,FakePOInfo 模式)
|
||||
|
||||
`platform-legacy-core/.../privilege/MultiDimDataPrivilegeTest.java`(9 测,**沿用既有 DataPrivilegeTest 的 FakePOInfo 反射注入 + 纯 ctx 模式**,绕开 DB/Spring):
|
||||
|
||||
| 测试 | 覆盖 |
|
||||
|------|------|
|
||||
| `whereClause_currentUserDepart_singleDim` | 部门维 `P.DEPARTID='DEP_1'` |
|
||||
| `whereClause_currentUserOrg_singleDim` | 组织维 `P.ORGID='ORG_2'` |
|
||||
| `whereClause_specialDepart_forcedInClause` | SPECIALDEPART 强制 `in('DEP_1','DEP_2')`(非等值) |
|
||||
| `whereClause_multiConditional_opAnd` | 单规则内 op=AND 串联(部门 AND 组织) |
|
||||
| `whereClause_multiConditional_opOr` | 单规则内 op=OR 串联(会议主持 OR 记录) |
|
||||
| `whereClause_multiRule_roleOr_bothMatched` | 多规则角色 OR(两条规则 OR 合并) |
|
||||
| `whereClause_multiRule_roleOr_onlyOneMatched` | 多规则只命中一条(只拼该子句) |
|
||||
| `whereClause_multiRule_roleOr_noneMatched_throws` | 无命中角色 → PrivilegeException |
|
||||
| `whereClause_threeDim_andChain` | 建筑三维 3 条件 AND 链(OWNER AND 部门 AND 组织) |
|
||||
|
||||
> **≥6 目标达成(9 测)**;`DataPrivilegeTest`(既有 9 测)同步全绿,无回归。
|
||||
|
||||
全模块 `mvn clean install`:**BUILD SUCCESS**;ArchUnit `ArchitectureRulesTest` 1/1 绿;legacy-core 45 / metadata 34 / parity 30 / auth 16 单测 0 失败。
|
||||
|
||||
---
|
||||
|
||||
## 七、与决策会「P2 进度偏差>50% 触发 S1」对照
|
||||
|
||||
| 决策会条款 | 本期对照 |
|
||||
|-----------|---------|
|
||||
| P2 进度偏差 >50% 触发 S1 应急 | **未触发**:P2-4 全部任务目标达成——普查(1079 条归型)/ 全形态实测(14 形态 100%,超 ≥12 目标)/ 客户库抽测(2 实体 MATCH,超 ≥2 目标)/ 单测(9,超 ≥6 目标)/ 全模块绿。无进度偏差。 |
|
||||
| R1(多维隔离语义)实质判定 | **成立**(§五.2),不构成 P2 阻塞,可作数据权限底座。 |
|
||||
|
||||
---
|
||||
|
||||
## 八、纪律与产物对照
|
||||
|
||||
| 任务要求 | 交付 |
|
||||
|---------|------|
|
||||
| 客户库规则形态普查(只读) | ✅ §二(1079 条归型 + OwnProjectWhere 值) |
|
||||
| 多维形态全覆盖实测(≥12 形态全过) | ✅ §四(14 形态 100% + 7/7 负例) |
|
||||
| 客户库多维规则抽测(≥2 条只读) | ✅ §五.1(DM_FILE/SYS_USER MATCH) |
|
||||
| 单测 ≥6(getWhereClause 拼接矩阵) | ✅ §六(9 测) |
|
||||
| 全模块 test + ArchUnit 绿 | ✅ BUILD SUCCESS |
|
||||
| R1 风险判定结论 | ✅ §五.2(成立)+ §五.3 缺口清单 |
|
||||
| 新坑进迁移手册 | ✅ §5.34(asDepart/asOrg 测试通道)/ §5.35(bootstrap 宽前缀 DELETE 误删 SYS 元数据) |
|
||||
| 端口 8088,8084/8087 未动;客户库只读未写规则 | ✅ |
|
||||
| git 只 add 自己文件,commit 前核对并行代理 | ✅ 见提交记录 |
|
||||
| 结束 kill 8088 | ✅ 见末节 |
|
||||
@@ -0,0 +1,263 @@
|
||||
package com.dsasp.server.privilege;
|
||||
|
||||
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.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import com.dsasp.server.common.dataDic.bean.AbstractPOJOInfo;
|
||||
import com.dsasp.server.common.exception.PrivilegeException;
|
||||
import com.dsasp.server.common.privilege.bean.Conditional;
|
||||
import com.dsasp.server.common.privilege.bean.DataFilterRule;
|
||||
import com.dsasp.server.common.user.service.LoggedInUser;
|
||||
import com.dsasp.server.privilege.service.DataPrivilegeServiceImpl;
|
||||
|
||||
/**
|
||||
* P2-4 多维数据权限单测:覆盖 {@code DataPrivilegeServiceImpl.getWhereClause} 的<b>多维 + 多条件 +
|
||||
* 多规则</b>拼接矩阵(部门 / 组织 / 指定部门集 / op=AND/OR 串联 / 多规则角色 OR)。
|
||||
*
|
||||
* <p>沿用 {@link DataPrivilegeTest} 的 FakePOInfo 反射注入 + 纯 ctx 模式(绕开 DB/Spring)。
|
||||
* 仅用 CURRENTUSERDEPART / CURRENTUSERORG / SPECIALDEPART(convertSplitStrToSql,纯函数)+ 等值/in,
|
||||
* <b>不触达 SysConfig / OWNNERPROJECT</b>(那两者需 Spring 上下文,留给 --multidim 集成对拍验)。
|
||||
* 语义与 framework 原版逐字一致。
|
||||
*/
|
||||
class MultiDimDataPrivilegeTest {
|
||||
|
||||
private final DataPrivilegeServiceImpl service = new DataPrivilegeServiceImpl();
|
||||
|
||||
@BeforeEach
|
||||
@SuppressWarnings("unchecked")
|
||||
void clearCache() throws Exception {
|
||||
Field f = AbstractPOJOInfo.class.getDeclaredField("s_cache");
|
||||
f.setAccessible(true);
|
||||
((Map<String, ?>) f.get(null)).clear();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private void putPoInfo(String table, FakePOInfo info) throws Exception {
|
||||
Field f = AbstractPOJOInfo.class.getDeclaredField("s_cache");
|
||||
f.setAccessible(true);
|
||||
((Map<String, FakePOInfo>) f.get(null)).put(table, info);
|
||||
}
|
||||
|
||||
private static Conditional cond(String col, String sign, String type, String back, String op) {
|
||||
Conditional c = new Conditional();
|
||||
c.setPreConditional(col);
|
||||
c.setSign(sign);
|
||||
c.setType(type);
|
||||
c.setBackConditional(back);
|
||||
c.setOp(op);
|
||||
return c;
|
||||
}
|
||||
|
||||
private static DataFilterRule rule(List<String> roles, Conditional... conds) {
|
||||
DataFilterRule r = new DataFilterRule();
|
||||
r.setId("rule-" + roles);
|
||||
r.setRoles(roles);
|
||||
r.setConditionalList(Arrays.asList(conds));
|
||||
return r;
|
||||
}
|
||||
|
||||
/** 多维 ctx:user / depart / org 任意可空。 */
|
||||
private static Properties ctx(String user, String depart, String org, String... roles) {
|
||||
Properties p = new Properties();
|
||||
p.setProperty(LoggedInUser.CURRENTUSER, user);
|
||||
if (depart != null) {
|
||||
p.setProperty(LoggedInUser.CURRENTDEPART, depart);
|
||||
}
|
||||
if (org != null) {
|
||||
p.setProperty(LoggedInUser.CURRENTORG, org);
|
||||
}
|
||||
List<String> roleList = new ArrayList<>(Arrays.asList(roles));
|
||||
p.put("ROLES", roleList);
|
||||
return p;
|
||||
}
|
||||
|
||||
// ---- 单维:部门 / 组织 ----
|
||||
|
||||
@Test
|
||||
void whereClause_currentUserDepart_singleDim() throws Exception {
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_MDDEPT", "部门台账",
|
||||
List.of(rule(List.of("ROLE_DEPT"),
|
||||
cond("DEPARTID", "=", Conditional.CURRENTUSERDEPART, "{CURRENTUSERDEPARTID}", null))));
|
||||
putPoInfo("EIP4PT_MDDEPT", info);
|
||||
|
||||
String where = service.getWhereClause(ctx("U1", "DEP_1", null, "ROLE_DEPT"), "EIP4PT_MDDEPT");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.contains("P.DEPARTID"), where);
|
||||
assertTrue(where.contains("='DEP_1'"), where);
|
||||
}
|
||||
|
||||
@Test
|
||||
void whereClause_currentUserOrg_singleDim() throws Exception {
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_MDORG", "组织台账",
|
||||
List.of(rule(List.of("ROLE_ORG"),
|
||||
cond("ORGID", "=", Conditional.CURRENTUSERORG, "{CURRENTUSERORGID}", null))));
|
||||
putPoInfo("EIP4PT_MDORG", info);
|
||||
|
||||
String where = service.getWhereClause(ctx("U1", null, "ORG_2", "ROLE_ORG"), "EIP4PT_MDORG");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.contains("P.ORGID"), where);
|
||||
assertTrue(where.contains("='ORG_2'"), where);
|
||||
}
|
||||
|
||||
// ---- SPECIALDEPART:指定部门集(强制 in,convertSplitStrToSql) ----
|
||||
|
||||
@Test
|
||||
void whereClause_specialDepart_forcedInClause() throws Exception {
|
||||
// sign 写 '=' 也应被引擎强制为 in(...);多值用逗号分隔
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_MDSPECDEPT", "指定部门",
|
||||
List.of(rule(List.of("ROLE_SPEC"),
|
||||
cond("DEPARTID", "=", Conditional.SPECIALDEPART, "DEP_1,DEP_2", null))));
|
||||
putPoInfo("EIP4PT_MDSPECDEPT", info);
|
||||
|
||||
String where = service.getWhereClause(ctx("U1", "DEP_9", null, "ROLE_SPEC"), "EIP4PT_MDSPECDEPT");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.contains("P.DEPARTID"), where);
|
||||
// 引擎 SIGN_CONTAIN="in" 直接拼,后随 "(...)"(无空格):P.DEPARTID in('DEP_1','DEP_2')
|
||||
assertTrue(where.contains("in('DEP_1','DEP_2')"), where);
|
||||
// 强制 in:不应出现等号比较单值
|
||||
assertFalse(where.contains("='DEP_1,DEP_2'"), where);
|
||||
}
|
||||
|
||||
// ---- 多条件 op 串联(单规则内) ----
|
||||
|
||||
@Test
|
||||
void whereClause_multiConditional_opAnd() throws Exception {
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_MDCOMBO", "部门项目",
|
||||
List.of(rule(List.of("ROLE_COMBO"),
|
||||
cond("DEPARTID", "=", Conditional.CURRENTUSERDEPART, "{CURRENTUSERDEPARTID}", "AND"),
|
||||
cond("ORGID", "=", Conditional.CURRENTUSERORG, "{CURRENTUSERORGID}", null))));
|
||||
putPoInfo("EIP4PT_MDCOMBO", info);
|
||||
|
||||
String where = service.getWhereClause(ctx("U1", "DEP_1", "ORG_1", "ROLE_COMBO"), "EIP4PT_MDCOMBO");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.contains("P.DEPARTID"), where);
|
||||
assertTrue(where.contains("='DEP_1'"), where);
|
||||
assertTrue(where.contains(" AND "), where);
|
||||
assertTrue(where.contains("P.ORGID"), where);
|
||||
assertTrue(where.contains("='ORG_1'"), where);
|
||||
}
|
||||
|
||||
@Test
|
||||
void whereClause_multiConditional_opOr() throws Exception {
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_MDOR2", "会议纪要",
|
||||
List.of(rule(List.of("ROLE_M"),
|
||||
cond("COMPERE", "=", Conditional.CURRENTUSER, "{CURRENTUSERID}", "OR"),
|
||||
cond("CLERK", "=", Conditional.CURRENTUSER, "{CURRENTUSERID}", null))));
|
||||
putPoInfo("EIP4PT_MDOR2", info);
|
||||
|
||||
String where = service.getWhereClause(ctx("U7", null, null, "ROLE_M"), "EIP4PT_MDOR2");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.contains("P.COMPERE"), where);
|
||||
assertTrue(where.contains("P.CLERK"), where);
|
||||
// 单规则内 op=OR 连接两个条件(getFilterSql 内层 OR,非多规则间 OR)
|
||||
assertTrue(where.contains(" OR "), where);
|
||||
assertTrue(where.contains("='U7'"), where);
|
||||
}
|
||||
|
||||
// ---- 多规则角色 OR(同实体两条规则) ----
|
||||
|
||||
@Test
|
||||
void whereClause_multiRule_roleOr_bothMatched() throws Exception {
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_SUBCONTRACT", "分包商台账",
|
||||
List.of(
|
||||
rule(List.of("ROLE_OR_A"),
|
||||
cond("OWNER", "=", Conditional.CURRENTUSER, "{CURRENTUSERID}", null)),
|
||||
rule(List.of("ROLE_OR_B"),
|
||||
cond("DEPARTID", "=", Conditional.CURRENTUSERDEPART, "{CURRENTUSERDEPARTID}", null))));
|
||||
putPoInfo("EIP4PT_SUBCONTRACT", info);
|
||||
|
||||
// 同时持有两角色 → 两条规则子句以 OR 合并
|
||||
String where = service.getWhereClause(
|
||||
ctx("USER_PM", "DEP_1", null, "ROLE_OR_A", "ROLE_OR_B"), "EIP4PT_SUBCONTRACT");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.startsWith(" AND ("), where);
|
||||
assertTrue(where.contains("P.OWNER"), where);
|
||||
assertTrue(where.contains("='USER_PM'"), where);
|
||||
assertTrue(where.contains(" OR "), where);
|
||||
assertTrue(where.contains("P.DEPARTID"), where);
|
||||
assertTrue(where.contains("='DEP_1'"), where);
|
||||
}
|
||||
|
||||
@Test
|
||||
void whereClause_multiRule_roleOr_onlyOneMatched() throws Exception {
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_SUBCONTRACT", "分包商台账",
|
||||
List.of(
|
||||
rule(List.of("ROLE_OR_A"),
|
||||
cond("OWNER", "=", Conditional.CURRENTUSER, "{CURRENTUSERID}", null)),
|
||||
rule(List.of("ROLE_OR_B"),
|
||||
cond("DEPARTID", "=", Conditional.CURRENTUSERDEPART, "{CURRENTUSERDEPARTID}", null))));
|
||||
putPoInfo("EIP4PT_SUBCONTRACT", info);
|
||||
|
||||
// 只持有 ROLE_OR_B → 只拼部门子句,无 OWNER 子句、无规则间 OR
|
||||
String where = service.getWhereClause(
|
||||
ctx("USER_X", "DEP_2", null, "ROLE_OR_B"), "EIP4PT_SUBCONTRACT");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.contains("P.DEPARTID"), where);
|
||||
assertTrue(where.contains("='DEP_2'"), where);
|
||||
assertFalse(where.contains("P.OWNER"), where);
|
||||
}
|
||||
|
||||
@Test
|
||||
void whereClause_multiRule_roleOr_noneMatched_throws() throws Exception {
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_SUBCONTRACT", "分包商台账",
|
||||
List.of(
|
||||
rule(List.of("ROLE_OR_A"),
|
||||
cond("OWNER", "=", Conditional.CURRENTUSER, "{CURRENTUSERID}", null)),
|
||||
rule(List.of("ROLE_OR_B"),
|
||||
cond("DEPARTID", "=", Conditional.CURRENTUSERDEPART, "{CURRENTUSERDEPARTID}", null))));
|
||||
putPoInfo("EIP4PT_SUBCONTRACT", info);
|
||||
|
||||
// 无任何命中角色 → first 分支抛 PrivilegeException
|
||||
PrivilegeException ex = assertThrows(PrivilegeException.class,
|
||||
() -> service.getWhereClause(ctx("USER_Z", "DEP_9", null, "ROLE_NOBODY"), "EIP4PT_SUBCONTRACT"));
|
||||
assertTrue(ex.getMessage().contains("分包商台账"), ex.getMessage());
|
||||
}
|
||||
|
||||
// ---- 建筑三维:单规则 3 条件 AND 串联(负责人 OWNER AND 部门 AND 组织,均纯类型) ----
|
||||
|
||||
@Test
|
||||
void whereClause_threeDim_andChain() throws Exception {
|
||||
// 三维全用纯类型(CURRENTUSER/DEPART/ORG),不触达 SysConfig;验证 3 条件 op=AND 串联拼接
|
||||
FakePOInfo info = new FakePOInfo("EIP4PT_SUBCONTRACT", "分包商台账",
|
||||
List.of(rule(List.of("ROLE_SUB"),
|
||||
cond("OWNER", "=", Conditional.CURRENTUSER, "{CURRENTUSERID}", "AND"),
|
||||
cond("DEPARTID", "=", Conditional.CURRENTUSERDEPART, "{CURRENTUSERDEPARTID}", "AND"),
|
||||
cond("ORGID", "=", Conditional.CURRENTUSERORG, "{CURRENTUSERORGID}", null))));
|
||||
putPoInfo("EIP4PT_SUBCONTRACT", info);
|
||||
|
||||
String where = service.getWhereClause(
|
||||
ctx("USER_PM", "DEP_1", "ORG_1", "ROLE_SUB"), "EIP4PT_SUBCONTRACT");
|
||||
assertNotNull(where);
|
||||
assertTrue(where.contains("P.OWNER"), where);
|
||||
assertTrue(where.contains("='USER_PM'"), where);
|
||||
assertTrue(where.contains("P.DEPARTID"), where);
|
||||
assertTrue(where.contains("='DEP_1'"), where);
|
||||
assertTrue(where.contains("P.ORGID"), where);
|
||||
assertTrue(where.contains("='ORG_1'"), where);
|
||||
// 三条件链 → 2 个 op=AND 连接;外层 getWhereClause 还有 " AND ( " 包裹(共 3 处 " AND ")
|
||||
assertEquals(3, countOccurrences(where, " AND "), where);
|
||||
}
|
||||
|
||||
private static int countOccurrences(String haystack, String needle) {
|
||||
int n = 0;
|
||||
int idx = 0;
|
||||
while ((idx = haystack.indexOf(needle, idx)) >= 0) {
|
||||
n++;
|
||||
idx += needle.length();
|
||||
}
|
||||
return n;
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,7 @@ public class EntityController {
|
||||
* 这些键不是实体列,是协议/控制参数,不过白名单(但仍各自做语义校验,见 list 方法)。
|
||||
*/
|
||||
private static final Set<String> RESERVED_KEYS = Set.of(
|
||||
"page", "perPage", "asUser", "roles", "orderBy", "orderDir");
|
||||
"page", "perPage", "asUser", "roles", "asDepart", "asOrg", "orderBy", "orderDir");
|
||||
|
||||
private final POJOCRUDService pojoCRUDService;
|
||||
private final IdentifierWhitelist identifierWhitelist;
|
||||
@@ -58,6 +58,8 @@ public class EntityController {
|
||||
@RequestParam(defaultValue = "10") int perPage,
|
||||
@RequestParam(required = false) String asUser,
|
||||
@RequestParam(required = false) String roles,
|
||||
@RequestParam(required = false) String asDepart,
|
||||
@RequestParam(required = false) String asOrg,
|
||||
@RequestParam(required = false) String orderBy,
|
||||
@RequestParam(required = false) String orderDir,
|
||||
@RequestParam Map<String, String> allParams) {
|
||||
@@ -65,7 +67,7 @@ public class EntityController {
|
||||
// 安全第 1 层:表名必须存在于 SYS_ENTITY,否则 400(非法表名不进引擎拼接)
|
||||
identifierWhitelist.requireLegalTable(t);
|
||||
|
||||
Properties ctx = buildCtx(asUser, roles);
|
||||
Properties ctx = buildCtx(asUser, roles, asDepart, asOrg);
|
||||
Map<String, Object> cond = new HashMap<>();
|
||||
cond.put(POJOCRUDService.PAGE_START, (page - 1) * perPage);
|
||||
cond.put(POJOCRUDService.PAGE_SIZE, perPage);
|
||||
@@ -139,11 +141,19 @@ public class EntityController {
|
||||
* <li><b>都没有</b>(无令牌、无 asUser)→ ADMIN 视角,不过滤(与原默认行为一致)。</li>
|
||||
* </ol>
|
||||
*/
|
||||
private Properties buildCtx(String asUser, String roles) {
|
||||
private Properties buildCtx(String asUser, String roles, String asDepart, String asOrg) {
|
||||
// 1) 显式 asUser 测试通道优先(保持 C2 既有行为不变)
|
||||
if (asUser != null && !asUser.isBlank()) {
|
||||
Properties ctx = new Properties();
|
||||
ctx.setProperty(LoggedInUser.CURRENTUSER, asUser);
|
||||
// P2-4 多维测试通道:可选注入当前部门/机构,触发引擎 CURRENTUSERDEPARTID/CURRENTUSERORGID
|
||||
// 维度过滤(getFilterSql 读 ctx.CURRENTDEPART / ctx.CURRENTORG)。不传则维持单维(用户)行为。
|
||||
if (asDepart != null && !asDepart.isBlank()) {
|
||||
ctx.setProperty(LoggedInUser.CURRENTDEPART, asDepart);
|
||||
}
|
||||
if (asOrg != null && !asOrg.isBlank()) {
|
||||
ctx.setProperty(LoggedInUser.CURRENTORG, asOrg);
|
||||
}
|
||||
List<String> roleList = new ArrayList<>();
|
||||
if (roles != null && !roles.isBlank()) {
|
||||
for (String r : roles.split(",")) {
|
||||
|
||||
@@ -43,7 +43,7 @@ class EntityControllerWhitelistTest {
|
||||
EntityController c = new EntityController(engine, wl);
|
||||
|
||||
assertThrows(IllegalIdentifierException.class,
|
||||
() -> c.list("NOPE", 1, 10, null, null, null, null, new HashMap<>()));
|
||||
() -> c.list("NOPE", 1, 10, null, null, null, null, null, null, new HashMap<>()));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -57,7 +57,7 @@ class EntityControllerWhitelistTest {
|
||||
Map<String, String> params = new HashMap<>();
|
||||
params.put("XX' OR 1=1--", "x");
|
||||
assertThrows(IllegalIdentifierException.class,
|
||||
() -> c.list(TABLE, 1, 10, null, null, null, null, params));
|
||||
() -> c.list(TABLE, 1, 10, null, null, null, null, null, null, params));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -68,7 +68,7 @@ class EntityControllerWhitelistTest {
|
||||
|
||||
// orderBy 列合法(白名单不抛),但 orderDir=drop 非 asc/desc → Controller 抛
|
||||
IllegalIdentifierException ex = assertThrows(IllegalIdentifierException.class,
|
||||
() -> c.list(TABLE, 1, 10, null, null, "ORDERNO", "drop", new HashMap<>()));
|
||||
() -> c.list(TABLE, 1, 10, null, null, null, null, "ORDERNO", "drop", new HashMap<>()));
|
||||
assertFalse(ex.getMessage().contains("drop")); // 不回显非法值
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ class EntityControllerWhitelistTest {
|
||||
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult);
|
||||
EntityController c = new EntityController(engine, wl);
|
||||
|
||||
Map<String, Object> resp = c.list(TABLE, 1, 10, null, null, "ORDERNO", "asc", new HashMap<>());
|
||||
Map<String, Object> resp = c.list(TABLE, 1, 10, null, null, null, null, "ORDERNO", "asc", new HashMap<>());
|
||||
assertEquals(0, resp.get("status"));
|
||||
|
||||
// 引擎拿到的 cond.ORDER 必须是安全装配的 " ORDER BY ORDERNO ASC"
|
||||
@@ -108,7 +108,7 @@ class EntityControllerWhitelistTest {
|
||||
params.put("perPage", "10");
|
||||
params.put("asUser", "u1");
|
||||
params.put("roles", "r1");
|
||||
c.list(TABLE, 1, 10, "u1", "r1", null, null, params);
|
||||
c.list(TABLE, 1, 10, "u1", "r1", null, null, null, null, params);
|
||||
|
||||
// 表名仍校验,但保留键不进 requireLegalColumn
|
||||
verify(wl).requireLegalTable(TABLE);
|
||||
|
||||
@@ -0,0 +1,205 @@
|
||||
package com.eip4.platform.parity.selfcheck;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import com.eip4.platform.parity.diff.DiffReport;
|
||||
|
||||
/**
|
||||
* P2-4 多维数据权限「全形态」对拍执行器(本地 eip4m0,可写;bootstrap-multidim.sql 自举)。
|
||||
*
|
||||
* <p>区别于 C2(单维 CREATEBY)与 P2-1(客户库只读 view-all/userid-self),本模式按客户库普查
|
||||
* 发现的「多维隔离真实形态」(部门 × 组织 × 项目 × 分包商)在本地构造受控实体 + 规则矩阵,
|
||||
* 用真实多维上下文(asUser + asDepart + asOrg + roles)驱动引擎行级过滤路径,与 JDBC <b>同语义
|
||||
* 等价 WHERE</b> 逐行对拍。等价 WHERE 严格按 {@code DataPrivilegeServiceImpl.getFilterSql} 口径重建:
|
||||
* <ul>
|
||||
* <li>CURRENTUSERID → {@code P.<col> ='<user>'};CURRENTUSERDEPARTID → {@code ='<depart>'};
|
||||
* CURRENTUSERORGID → {@code ='<org>'}(TO_STRING 单引号)。</li>
|
||||
* <li>SPECIALDEPART/ORG → {@code P.<col> in ('v1','v2',...)}(sign 被强制为 in)。</li>
|
||||
* <li>OWNNERPROJECT → {@code P.<col> in (SELECT PM_PROJECTID FROM PM_PROJECT_USER WHERE USERID='<user>')}
|
||||
* (OwnProjectWhere SysConfig,{CURRENTUSERID} 已替换)。</li>
|
||||
* <li>op 串联:同规则内多 conditional 以 op(AND/OR)连接;多规则同实体以 OR 合并(按角色命中)。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>每个形态:正例(引擎过滤 == 等价 WHERE 逐行)+ 负例(无命中角色 → PrivilegeException,HTTP 非 200)。
|
||||
* 引擎语义与预期不符的,DiffReport 完整保留差异明细(R1 风险实质判定输入,不吞)。
|
||||
*/
|
||||
public class MultiDimPrivilegeRunner {
|
||||
|
||||
private final EngineHttpClient engine;
|
||||
private final JdbcResultReader jdbc;
|
||||
private final SelfCheckRunner selfCheck;
|
||||
|
||||
public MultiDimPrivilegeRunner(String engineBaseUrl, DataSource dataSource) {
|
||||
this.engine = new EngineHttpClient(engineBaseUrl);
|
||||
this.jdbc = new JdbcResultReader(dataSource);
|
||||
this.selfCheck = new SelfCheckRunner(engineBaseUrl, dataSource);
|
||||
}
|
||||
|
||||
/** 一个多维形态用例:实体 + 多维 ctx(user/depart/org/roles) + 等价 WHERE(null=全表) + 维度标签。 */
|
||||
public static final class Case {
|
||||
public final String label; // 人类可读形态标签
|
||||
public final String table;
|
||||
public final String user; // asUser(可 null)
|
||||
public final String depart; // asDepart(可 null)
|
||||
public final String org; // asOrg(可 null)
|
||||
public final String roles; // 逗号分隔
|
||||
public final String equivalentWhere; // JDBC 等价 WHERE(不含 WHERE 关键字;null=全表)
|
||||
|
||||
public Case(String label, String table, String user, String depart, String org,
|
||||
String roles, String equivalentWhere) {
|
||||
this.label = label;
|
||||
this.table = table.toUpperCase();
|
||||
this.user = user;
|
||||
this.depart = depart;
|
||||
this.org = org;
|
||||
this.roles = roles;
|
||||
this.equivalentWhere = equivalentWhere;
|
||||
}
|
||||
}
|
||||
|
||||
/** 一个负例:无命中角色 ctx → 期望引擎抛 PrivilegeException(HTTP 非 200)。 */
|
||||
public static final class NegCase {
|
||||
public final String label;
|
||||
public final String table;
|
||||
public final String user;
|
||||
public final String roles; // 绝不命中该实体规则角色集的占位
|
||||
|
||||
public NegCase(String label, String table, String user, String roles) {
|
||||
this.label = label;
|
||||
this.table = table.toUpperCase();
|
||||
this.user = user;
|
||||
this.roles = roles;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 全形态正例矩阵(≥12 形态)。等价 WHERE 与 bootstrap-multidim.sql 的规则 + 种子数据严格对齐。
|
||||
* 维度取值约定:部门 DEP_1/DEP_2;组织 ORG_1/ORG_2;项目负责人 USER_PM(负责 PRJ_A/PRJ_B)、
|
||||
* USER_BOB(负责 PRJ_C);分包商 SUB_1/SUB_2。
|
||||
*/
|
||||
public static List<Case> matrix() {
|
||||
List<Case> cs = new ArrayList<>();
|
||||
String ownProjPM = "PROJECTID in (SELECT PM_PROJECTID FROM PM_PROJECT_USER WHERE USERID='USER_PM')";
|
||||
String ownProjBob = "PROJECTID in (SELECT PM_PROJECTID FROM PM_PROJECT_USER WHERE USERID='USER_BOB')";
|
||||
|
||||
// --- 单条件单维 ---
|
||||
// 1) CURRENTUSERDEPARTID:部门=当前部门(DEP_1)
|
||||
cs.add(new Case("单维-部门 CURRENTUSERDEPARTID(DEP_1)", "EIP4PT_MDDEPT",
|
||||
"USER_PM", "DEP_1", null, "ROLE_DEPT", "departid = 'DEP_1'"));
|
||||
// 2) CURRENTUSERDEPARTID:换部门(DEP_2)→ 看到另一子集(同规则,不同 ctx)
|
||||
cs.add(new Case("单维-部门 CURRENTUSERDEPARTID(DEP_2)", "EIP4PT_MDDEPT",
|
||||
"USER_X", "DEP_2", null, "ROLE_DEPT", "departid = 'DEP_2'"));
|
||||
// 3) CURRENTUSERORGID:组织=当前机构(ORG_1)
|
||||
cs.add(new Case("单维-组织 CURRENTUSERORGID(ORG_1)", "EIP4PT_MDORG",
|
||||
"USER_PM", null, "ORG_1", "ROLE_ORG", "orgid = 'ORG_1'"));
|
||||
// 4) CURRENTUSERORGID:换机构(ORG_2)
|
||||
cs.add(new Case("单维-组织 CURRENTUSERORGID(ORG_2)", "EIP4PT_MDORG",
|
||||
"USER_X", null, "ORG_2", "ROLE_ORG", "orgid = 'ORG_2'"));
|
||||
// 5) SPECIALDEPART:指定部门集 in (DEP_1,DEP_2)(引擎未受 ctx 部门影响,静态集)
|
||||
cs.add(new Case("单维-指定部门集 SPECIALDEPART(DEP_1,DEP_2)", "EIP4PT_MDSPECDEPT",
|
||||
"USER_PM", "DEP_9", null, "ROLE_SPEC", "departid in ('DEP_1','DEP_2')"));
|
||||
// 6) OWNNERPROJECT:项目∈我负责的项目(USER_PM → PRJ_A,PRJ_B)
|
||||
cs.add(new Case("单维-项目负责人 OWNNERPROJECT(USER_PM)", "EIP4PT_MDPROJECT",
|
||||
"USER_PM", null, null, "ROLE_PROJ", ownProjPM));
|
||||
// 7) OWNNERPROJECT:换负责人(USER_BOB → PRJ_C)
|
||||
cs.add(new Case("单维-项目负责人 OWNNERPROJECT(USER_BOB)", "EIP4PT_MDPROJECT",
|
||||
"USER_BOB", null, null, "ROLE_PROJ", ownProjBob));
|
||||
|
||||
// --- 多条件 op 串联(单规则内) ---
|
||||
// 8) AND:部门=DEP_1 AND 项目∈我负责(USER_PM)
|
||||
cs.add(new Case("多条件 op=AND 部门 AND 项目(USER_PM/DEP_1)", "EIP4PT_MDCOMBO",
|
||||
"USER_PM", "DEP_1", null, "ROLE_COMBO",
|
||||
"departid = 'DEP_1' AND " + ownProjPM));
|
||||
// 9) AND:换部门 DEP_2(USER_BOB → PRJ_C),交集更小
|
||||
cs.add(new Case("多条件 op=AND 部门 AND 项目(USER_BOB/DEP_2)", "EIP4PT_MDCOMBO",
|
||||
"USER_BOB", "DEP_2", null, "ROLE_COMBO",
|
||||
"departid = 'DEP_2' AND " + ownProjBob));
|
||||
|
||||
// --- 多规则角色 OR(同实体两条规则) ---
|
||||
// 10) 同时命中两角色 → 规则A(OWNER=user) OR 规则B(DEPARTID=depart)
|
||||
cs.add(new Case("多规则角色 OR(命中A+B:OWNER OR 部门)", "EIP4PT_MDOR",
|
||||
"USER_PM", "DEP_1", null, "ROLE_OR_A,ROLE_OR_B",
|
||||
"(owner = 'USER_PM') OR (departid = 'DEP_1')"));
|
||||
// 11) 只命中规则A(OWNER=user)
|
||||
cs.add(new Case("多规则角色 OR(只命中A:OWNER)", "EIP4PT_MDOR",
|
||||
"USER_PM", "DEP_1", null, "ROLE_OR_A",
|
||||
"owner = 'USER_PM'"));
|
||||
// 12) 只命中规则B(DEPARTID=depart)
|
||||
cs.add(new Case("多规则角色 OR(只命中B:部门)", "EIP4PT_MDOR",
|
||||
"USER_X", "DEP_1", null, "ROLE_OR_B",
|
||||
"departid = 'DEP_1'"));
|
||||
|
||||
// --- 建筑三维(单规则 3 条件 AND 串联) ---
|
||||
// 13) OWNER=user AND DEPARTID=depart AND PROJECTID∈我负责(USER_PM/DEP_1)
|
||||
cs.add(new Case("建筑三维 OWNER AND 部门 AND 项目(USER_PM/DEP_1)", "EIP4PT_SUBCONTRACT",
|
||||
"USER_PM", "DEP_1", null, "ROLE_SUB",
|
||||
"owner = 'USER_PM' AND departid = 'DEP_1' AND " + ownProjPM));
|
||||
// 14) 换主体(USER_BOB/DEP_1 → PRJ_C),不同三维交集
|
||||
cs.add(new Case("建筑三维 OWNER AND 部门 AND 项目(USER_BOB/DEP_1)", "EIP4PT_SUBCONTRACT",
|
||||
"USER_BOB", "DEP_1", null, "ROLE_SUB",
|
||||
"owner = 'USER_BOB' AND departid = 'DEP_1' AND " + ownProjBob));
|
||||
return cs;
|
||||
}
|
||||
|
||||
/** 负例矩阵:每个受控实体一个「无命中角色」上下文,期望 PrivilegeException。 */
|
||||
public static List<NegCase> negativeMatrix() {
|
||||
List<NegCase> ns = new ArrayList<>();
|
||||
for (String t : new String[] {"EIP4PT_MDDEPT", "EIP4PT_MDORG", "EIP4PT_MDSPECDEPT",
|
||||
"EIP4PT_MDPROJECT", "EIP4PT_MDCOMBO", "EIP4PT_MDOR", "EIP4PT_SUBCONTRACT"}) {
|
||||
ns.add(new NegCase("负例-无命中角色", t, "USER_PM", "ROLE_NOBODY_MULTIDIM"));
|
||||
}
|
||||
return ns;
|
||||
}
|
||||
|
||||
/** 跑一个正例:引擎(多维 ctx)行级过滤 vs JDBC 等价 WHERE,逐行 diff(复用自对拍豁免内核)。 */
|
||||
public DiffReport checkPositive(Case c) {
|
||||
List<Map<String, Object>> left;
|
||||
List<Map<String, Object>> right;
|
||||
try {
|
||||
left = c.equivalentWhere == null
|
||||
? jdbc.readAll(c.table)
|
||||
: jdbc.query("SELECT * FROM " + c.table + " WHERE " + c.equivalentWhere);
|
||||
} catch (Exception e) {
|
||||
return error(c.label, "JDBC 基线读失败: " + e.getMessage());
|
||||
}
|
||||
try {
|
||||
right = engine.listAll(c.table, buildQuery(c));
|
||||
} catch (Exception e) {
|
||||
return error(c.label, "引擎过滤路径失败: " + e.getMessage());
|
||||
}
|
||||
return selfCheck.checkRows(c.table, c.label + " " + c.table, left, right);
|
||||
}
|
||||
|
||||
/** 负例:无命中角色 → 期望引擎抛 PrivilegeException(HTTP 非 200)。返回 HTTP 状态码。 */
|
||||
public int checkNegativeStatus(NegCase n) {
|
||||
try {
|
||||
return engine.statusOf(n.table, "asUser=" + n.user + "&roles=" + n.roles);
|
||||
} catch (Exception e) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
private static String buildQuery(Case c) {
|
||||
StringBuilder q = new StringBuilder("asUser=").append(c.user);
|
||||
if (c.depart != null) {
|
||||
q.append("&asDepart=").append(c.depart);
|
||||
}
|
||||
if (c.org != null) {
|
||||
q.append("&asOrg=").append(c.org);
|
||||
}
|
||||
q.append("&roles=").append(c.roles);
|
||||
return q.toString();
|
||||
}
|
||||
|
||||
private static DiffReport error(String label, String msg) {
|
||||
DiffReport r = new DiffReport(label);
|
||||
DiffReport.RowMismatch mm = new DiffReport.RowMismatch("RUNNER_ERROR");
|
||||
mm.cells.add(new DiffReport.CellDiff("error", null, msg, "VALUE"));
|
||||
r.mismatches.add(mm);
|
||||
return r;
|
||||
}
|
||||
}
|
||||
@@ -71,6 +71,12 @@ public final class ParityCli {
|
||||
System.exit(code);
|
||||
}
|
||||
|
||||
// P2-4 多维数据权限全形态对拍:--multidim(本地 eip4m0,bootstrap-multidim.sql 自举后)
|
||||
if (opt.containsKey("multidim")) {
|
||||
int code = runMultiDim(engine, ds, outDir);
|
||||
System.exit(code);
|
||||
}
|
||||
|
||||
// P2 真实实体只读权限对拍:--realprivilege [--realEntities=HR_SAFETYCARD,HR_EMPLOYEE]
|
||||
if (opt.containsKey("realprivilege")) {
|
||||
String ents = opt.getOrDefault("realEntities",
|
||||
@@ -254,6 +260,143 @@ public final class ParityCli {
|
||||
Files.writeString(path, sb.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* P2-4 多维数据权限全形态对拍(--multidim):本地 eip4m0 按 bootstrap-multidim.sql 构造的
|
||||
* 规则矩阵(部门/组织/指定部门集/项目负责人/多条件 AND/多规则角色 OR/建筑三维),用多维 ctx
|
||||
* (asUser+asDepart+asOrg+roles)驱动引擎行级过滤 vs JDBC 等价 WHERE 逐行 diff;并对每个受控实体
|
||||
* 跑负例(无命中角色 → PrivilegeException)。退出码:正例全一致且负例全被拒=0,否则=2。
|
||||
*/
|
||||
private static int runMultiDim(String engine, javax.sql.DataSource ds, Path outDir) throws Exception {
|
||||
System.out.println("=== P2-4 多维数据权限全形态对拍(--multidim)===");
|
||||
MultiDimPrivilegeRunner runner = new MultiDimPrivilegeRunner(engine, ds);
|
||||
|
||||
List<MultiDimPrivilegeRunner.Case> matrix = MultiDimPrivilegeRunner.matrix();
|
||||
List<DiffReport> reports = new ArrayList<>();
|
||||
List<String> labels = new ArrayList<>();
|
||||
int cleanCount = 0;
|
||||
long totalRows = 0;
|
||||
for (MultiDimPrivilegeRunner.Case c : matrix) {
|
||||
DiffReport r = runner.checkPositive(c);
|
||||
reports.add(r);
|
||||
labels.add(c.label);
|
||||
totalRows += r.leftRowCount;
|
||||
boolean clean = r.isClean();
|
||||
if (clean) {
|
||||
cleanCount++;
|
||||
}
|
||||
System.out.printf(" 正例 %-44s 行=%-3d 一致率=%.4f %s%n",
|
||||
c.label, r.leftRowCount, r.consistencyRate(), clean ? "OK" : "DIFF");
|
||||
}
|
||||
|
||||
List<MultiDimPrivilegeRunner.NegCase> negs = MultiDimPrivilegeRunner.negativeMatrix();
|
||||
Map<String, Integer> negStatus = new LinkedHashMap<>();
|
||||
int negPass = 0;
|
||||
for (MultiDimPrivilegeRunner.NegCase n : negs) {
|
||||
int code = runner.checkNegativeStatus(n);
|
||||
negStatus.put(n.table, code);
|
||||
boolean rejected = code != 200;
|
||||
if (rejected) {
|
||||
negPass++;
|
||||
}
|
||||
System.out.printf(" 负例 %-26s 无命中角色 → HTTP=%d %s%n",
|
||||
n.table, code, rejected ? "REJECTED(OK)" : "NOT-REJECTED(FAIL)");
|
||||
}
|
||||
|
||||
boolean allPositiveClean = cleanCount == reports.size();
|
||||
boolean allNegRejected = negPass == negs.size();
|
||||
boolean ok = allPositiveClean && allNegRejected;
|
||||
|
||||
String ts = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss"));
|
||||
Path json = outDir.resolve("multidim-parity-" + ts + ".json");
|
||||
Path md = outDir.resolve("multidim-parity-" + ts + ".md");
|
||||
writeMultiDimJson(json, matrix, reports, negStatus, cleanCount, totalRows, allNegRejected);
|
||||
writeMultiDimMarkdown(md, matrix, reports, negStatus, cleanCount, totalRows, allNegRejected);
|
||||
|
||||
System.out.println("\n=== P2-4 多维对拍汇总 ===");
|
||||
System.out.println("形态正例: " + reports.size() + ",全一致: " + cleanCount);
|
||||
System.out.println("总比对行数(JDBC 等价 WHERE 侧): " + totalRows);
|
||||
System.out.println("负例(无命中角色被拒): " + negPass + "/" + negs.size());
|
||||
System.out.printf("形态通过率: %.4f%n", reports.isEmpty() ? 1.0 : (double) cleanCount / reports.size());
|
||||
System.out.println("结果: " + (ok ? "✅ 全部通过" : "⚠️ 存在失败"));
|
||||
System.out.println("报告: " + json + " / " + md);
|
||||
return ok ? 0 : 2;
|
||||
}
|
||||
|
||||
private static void writeMultiDimJson(Path path, List<MultiDimPrivilegeRunner.Case> matrix,
|
||||
List<DiffReport> reports, Map<String, Integer> negStatus,
|
||||
int cleanCount, long totalRows, boolean allNegRejected) throws Exception {
|
||||
ObjectMapper m = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
|
||||
Map<String, Object> root = new LinkedHashMap<>();
|
||||
Map<String, Object> summary = new LinkedHashMap<>();
|
||||
summary.put("mode", "multidim");
|
||||
summary.put("formCases", reports.size());
|
||||
summary.put("formClean", cleanCount);
|
||||
summary.put("totalRows", totalRows);
|
||||
summary.put("formPassRate", reports.isEmpty() ? 1.0 : (double) cleanCount / reports.size());
|
||||
summary.put("negativeStatus", negStatus);
|
||||
summary.put("allNegativeRejected", allNegRejected);
|
||||
summary.put("allPass", cleanCount == reports.size() && allNegRejected);
|
||||
root.put("summary", summary);
|
||||
List<Map<String, Object>> rs = new ArrayList<>();
|
||||
for (int i = 0; i < reports.size(); i++) {
|
||||
Map<String, Object> one = new LinkedHashMap<>();
|
||||
one.put("form", matrix.get(i).label);
|
||||
one.put("entity", matrix.get(i).table);
|
||||
one.put("equivalentWhere", matrix.get(i).equivalentWhere == null
|
||||
? "(全表)" : matrix.get(i).equivalentWhere);
|
||||
one.put("report", reports.get(i).toSummaryMap());
|
||||
rs.add(one);
|
||||
}
|
||||
root.put("forms", rs);
|
||||
Files.writeString(path, m.writeValueAsString(root));
|
||||
}
|
||||
|
||||
private static void writeMultiDimMarkdown(Path path, List<MultiDimPrivilegeRunner.Case> matrix,
|
||||
List<DiffReport> reports, Map<String, Integer> negStatus,
|
||||
int cleanCount, long totalRows, boolean allNegRejected) throws Exception {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("# P2-4 多维数据权限全形态对拍报告\n\n");
|
||||
sb.append("> 数据源:本地 eip4m0(bootstrap-multidim.sql 自举的多维规则矩阵)。\n");
|
||||
sb.append("> 方法:多维 ctx(asUser + asDepart + asOrg + roles)驱动引擎行级过滤 vs JDBC 等价 WHERE 逐行 diff。\n\n");
|
||||
sb.append("- 形态正例: ").append(reports.size()).append(",全一致: ").append(cleanCount)
|
||||
.append(cleanCount == reports.size() ? " ✅" : " ⚠️").append("\n");
|
||||
sb.append("- 总比对行数(JDBC 等价 WHERE 侧): ").append(totalRows).append("\n");
|
||||
sb.append("- 形态通过率: ")
|
||||
.append(String.format("%.4f", reports.isEmpty() ? 1.0 : (double) cleanCount / reports.size())).append("\n");
|
||||
sb.append("- 负例(无命中角色被拒): ").append(allNegRejected ? "✅ 全部被拒" : "⚠️ 存在未拒").append("\n\n");
|
||||
|
||||
sb.append("## 形态矩阵:引擎多维行级过滤 vs JDBC 等价 WHERE\n\n");
|
||||
sb.append("| # | 形态 | 实体 | 等价 WHERE | 行数 | 一致率 | 结果 |\n");
|
||||
sb.append("|---|---|---|---|---|---|---|\n");
|
||||
for (int i = 0; i < reports.size(); i++) {
|
||||
DiffReport r = reports.get(i);
|
||||
MultiDimPrivilegeRunner.Case c = matrix.get(i);
|
||||
sb.append("| ").append(i + 1)
|
||||
.append(" | ").append(c.label)
|
||||
.append(" | ").append(c.table)
|
||||
.append(" | `").append(c.equivalentWhere == null ? "(全表)" : c.equivalentWhere).append("`")
|
||||
.append(" | ").append(r.leftRowCount)
|
||||
.append(" | ").append(String.format("%.4f", r.consistencyRate()))
|
||||
.append(" | ").append(r.isClean() ? "✅" : "⚠️").append(" |\n");
|
||||
}
|
||||
sb.append("\n## 负例:无命中角色访问受控实体\n\n");
|
||||
sb.append("| 实体 | HTTP 状态 | 期望 | 结果 |\n|---|---|---|---|\n");
|
||||
for (Map.Entry<String, Integer> e : negStatus.entrySet()) {
|
||||
boolean rejected = e.getValue() != 200;
|
||||
sb.append("| ").append(e.getKey()).append(" | ").append(e.getValue())
|
||||
.append(" | 非200(PrivilegeException) | ")
|
||||
.append(rejected ? "✅ 被拒" : "⚠️ 未拒").append(" |\n");
|
||||
}
|
||||
sb.append("\n");
|
||||
for (int i = 0; i < reports.size(); i++) {
|
||||
if (!reports.get(i).isClean()) {
|
||||
sb.append("### 差异明细:").append(matrix.get(i).label).append("\n\n");
|
||||
sb.append(reports.get(i).toMarkdown()).append("\n");
|
||||
}
|
||||
}
|
||||
Files.writeString(path, sb.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* P2 真实实体只读权限对拍:从客户库真实 SYS_FILTERRULE 配置发现可复现 (实体,用户,规则) 案例,
|
||||
* 用真实用户上下文驱动引擎行级过滤 vs JDBC 等价 WHERE 逐行 diff;并对每个候选实体跑负例
|
||||
|
||||
@@ -0,0 +1,393 @@
|
||||
-- ============================================================================
|
||||
-- eip4-platform P2-4 —— 多维数据权限「全形态」自举 bootstrap-multidim.sql
|
||||
-- ----------------------------------------------------------------------------
|
||||
-- 用途:在本地 eip4m0(localhost:5433)上,按客户库普查发现的「多维隔离真实形态」
|
||||
-- (项目×组织×部门×分包商)构造一组受控实体 + 规则矩阵,使保真层移植的
|
||||
-- DataPrivilegeServiceImpl 走引擎读路径产生<多维>行级过滤,供 --multidim 对拍。
|
||||
--
|
||||
-- 普查依据(客户库 eip3,只读):1079 条活跃规则;条件类型分布 CURRENTUSERORGID 323 /
|
||||
-- OWNNERPROJECT 165 / CURRENTUSERID 71 / CURRENTUSERDEPARTID 27 / NUMBER 167 /
|
||||
-- TEXT 71;sign = 628 / in 196;op 串联 AND 91 / OR 27;多条件规则 117(max 3 cond);
|
||||
-- 多规则同实体 303/345(角色 OR 合并);SPECIALDEPART/SPECIALORG=0(客户未用,
|
||||
-- 本脚本仍补构造以全覆盖引擎支持形态);OwnProjectWhere SysConfig 实际值=
|
||||
-- 「SELECT PM_PROJECTID FROM PM_PROJECT_USER WHERE USERID={CURRENTUSERID}」。
|
||||
--
|
||||
-- 引擎口径(已逐一核对 DataPrivilegeServiceImpl.getFilterSql):
|
||||
-- CURRENTUSERID → P.<col> <sign>'<CURRENTUSER>' (TO_STRING 自动加单引号)
|
||||
-- CURRENTUSERDEPARTID → P.<col> <sign>'<CURRENTDEPART>'
|
||||
-- CURRENTUSERORGID → P.<col> <sign>'<CURRENTORG>'
|
||||
-- SPECIALDEPART/ORG → P.<col> in ('v1','v2',...) (convertSplitStrToSql;sign 被强制为 in)
|
||||
-- OWNNERPROJECT → P.<col> in ( <OwnProjectWhere,{CURRENTUSERID}已替换> )
|
||||
-- 自定义(else) → P.<col> <sign><backConditional,占位符已替换>
|
||||
-- op 串联:同规则内多 conditional 以 op(AND/OR)连接;多规则同实体以 OR 合并(按角色命中)
|
||||
-- first 分支:无任何命中角色 → 抛 PrivilegeException
|
||||
--
|
||||
-- 纪律:可重复执行(DROP IF EXISTS + 固定 id 前缀);仅在本地库执行,绝不连客户库。
|
||||
-- ============================================================================
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 0. 清理(逆序;固定 id 前缀 m1000000- / 实体表 EIP4PT_MD*)
|
||||
-- ---------------------------------------------------------------------------
|
||||
DROP TABLE IF EXISTS sys_filterrulerole CASCADE;
|
||||
DROP TABLE IF EXISTS sys_filterrule CASCADE;
|
||||
DROP TABLE IF EXISTS eip4pt_mddept CASCADE;
|
||||
DROP TABLE IF EXISTS eip4pt_mdorg CASCADE;
|
||||
DROP TABLE IF EXISTS eip4pt_mdspecdept CASCADE;
|
||||
DROP TABLE IF EXISTS eip4pt_mdproject CASCADE;
|
||||
DROP TABLE IF EXISTS eip4pt_mdcombo CASCADE;
|
||||
DROP TABLE IF EXISTS eip4pt_mdor CASCADE;
|
||||
DROP TABLE IF EXISTS eip4pt_subcontract CASCADE;
|
||||
DROP TABLE IF EXISTS pm_project_user CASCADE;
|
||||
|
||||
DELETE FROM sys_referencevalue WHERE sys_referencevalue_id LIKE 'd1000000-%';
|
||||
DELETE FROM sys_reference WHERE sys_reference_id LIKE 'c1000000-%';
|
||||
-- ⚠️ 只删本脚本自建的属性:SYS_FILTERRULE/中间表自描述(a1000000-...-08xx/09xx,与
|
||||
-- bootstrap-privilege 同 id)+ 多维实体属性(amd00000-)。<b>绝不删 bootstrap-sys 的
|
||||
-- SYS_* 自描述属性(a1000000-...-01xx..07xx)</b>——否则引擎无法 loadPOJO(SYS_ENTITY) 而全盘 500。
|
||||
DELETE FROM sys_entityattribute WHERE sys_entityattribute_id LIKE 'a1000000-0000-0000-0000-0000000008%'
|
||||
OR sys_entityattribute_id LIKE 'a1000000-0000-0000-0000-0000000009%';
|
||||
DELETE FROM sys_entityattribute WHERE sys_entityattribute_id LIKE 'amd00000-%';
|
||||
DELETE FROM sys_entityattribute WHERE entityid LIKE 'emd00000-%';
|
||||
DELETE FROM sys_entity WHERE sys_entity_id LIKE 'emd00000-%'
|
||||
OR sys_entity_id IN ('e1000000-0000-0000-0000-000000000008','e1000000-0000-0000-0000-000000000009');
|
||||
|
||||
-- ===========================================================================
|
||||
-- 1. SYS_FILTERRULE / SYS_FILTERRULEROLE 平台表 + 自描述元数据
|
||||
-- (与 bootstrap-privilege.sql 同 id/结构;此处随多维场景一并自举,保持单文件可独立跑)
|
||||
-- ===========================================================================
|
||||
CREATE TABLE sys_filterrule (
|
||||
sys_filterrule_id character(36) NOT NULL,
|
||||
entityid character(36),
|
||||
filterrule text,
|
||||
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_filterrule_id)
|
||||
);
|
||||
CREATE TABLE sys_filterrulerole (
|
||||
filterruleid character(36) NOT NULL,
|
||||
roleid character varying(100) NOT NULL
|
||||
);
|
||||
|
||||
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_FILTERRULE', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0),
|
||||
('e1000000-0000-0000-0000-000000000009', '过滤规则角色', '规则与角色的中间表', 'SYS_FILTERRULEROLE', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 2, 1, 0, 0, 'ADMIN', 'ADMIN', 0);
|
||||
|
||||
INSERT INTO sys_entityattribute
|
||||
(sys_entityattribute_id, entityid, columnname, displayname, referenceid, referencevalue,
|
||||
ismandatory, isreadonly, iskey, isidentifier, iscombidentifier, isentitydisplay,
|
||||
entitydisplayseq, fieldlength, isactive, createby, updateby, version)
|
||||
VALUES
|
||||
('a1000000-0000-0000-0000-000000000801', 'e1000000-0000-0000-0000-000000000008', 'SYS_FILTERRULE_ID', '主键', 'CHAR', NULL, 1, 1, 1, 0, 0, 0, 1, 36, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000802', 'e1000000-0000-0000-0000-000000000008', 'ENTITYID', '实体ID', 'CHAR', NULL, 1, 0, 0, 0, 0, 1, 2, 36, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000803', 'e1000000-0000-0000-0000-000000000008', 'FILTERRULE', '过滤条件', 'NVARCHAR', NULL, 0, 0, 0, 0, 0, 0, 3, 4000, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000804', 'e1000000-0000-0000-0000-000000000008', 'ROLES', '角色', 'LIST', 'd1000000-0000-0000-0000-000000000001', 0, 0, 0, 0, 0, 0, 4, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000805', 'e1000000-0000-0000-0000-000000000008', 'ISACTIVE', '是否有效', 'BOOLEAN', NULL, 0, 0, 0, 0, 0, 0, 5, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000806', 'e1000000-0000-0000-0000-000000000008', 'VERSION', '版本', 'INTEGER', NULL, 0, 0, 0, 0, 0, 0, 6, 0, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000901', 'e1000000-0000-0000-0000-000000000009', 'FILTERRULEID', '规则ID', 'CHAR', NULL, 1, 0, 0, 0, 0, 0, 1, 36, 1, 'ADMIN', 'ADMIN', 0),
|
||||
('a1000000-0000-0000-0000-000000000902', 'e1000000-0000-0000-0000-000000000009', 'ROLEID', '角色', 'NVARCHAR', NULL, 1, 0, 0, 0, 0, 1, 2, 100, 1, 'ADMIN', 'ADMIN', 0);
|
||||
|
||||
INSERT INTO sys_reference
|
||||
(sys_reference_id, entityid, name, description, isactive, createtime, updatetime, createby, updateby, version)
|
||||
VALUES
|
||||
('c1000000-0000-0000-0000-000000000001', 'e1000000-0000-0000-0000-000000000009', 'ROLES->SYS_FILTERRULEROLE', 'P2-4 行级权限角色引用', 1, 0, 0, 'ADMIN', 'ADMIN', 0);
|
||||
INSERT INTO sys_referencevalue
|
||||
(sys_referencevalue_id, entityid, entityattributeid, name, isactive, createtime, updatetime, createby, updateby, version)
|
||||
VALUES
|
||||
('d1000000-0000-0000-0000-000000000001', 'e1000000-0000-0000-0000-000000000009', 'a1000000-0000-0000-0000-000000000901', 'ROLES 中间表映射', 1, 0, 0, 'ADMIN', 'ADMIN', 0);
|
||||
|
||||
-- ===========================================================================
|
||||
-- 2. OwnProjectWhere SysConfig(本地复刻客户库实际配置值)+ PM_PROJECT_USER 支撑表
|
||||
-- 引擎 OWNNERPROJECT 形态:P.<col> in ( SELECT PM_PROJECTID FROM PM_PROJECT_USER
|
||||
-- WHERE USERID='<currentUser>' )。USERID={CURRENTUSERID} 在拼接前被替换为带引号的当前用户。
|
||||
-- ===========================================================================
|
||||
DELETE FROM sys_application_config WHERE sys_application_config_id = 'com.dsasp.server.privilege.OwnProjectWhere';
|
||||
INSERT INTO sys_application_config (sys_application_config_id, value)
|
||||
VALUES ('com.dsasp.server.privilege.OwnProjectWhere',
|
||||
'SELECT PM_PROJECTID FROM PM_PROJECT_USER WHERE USERID={CURRENTUSERID}');
|
||||
|
||||
CREATE TABLE pm_project_user (
|
||||
pm_project_user_id character(36) NOT NULL,
|
||||
userid character varying(36),
|
||||
pm_projectid character varying(36),
|
||||
PRIMARY KEY (pm_project_user_id)
|
||||
);
|
||||
-- USER_PM 负责 PRJ_A、PRJ_B;USER_BOB 负责 PRJ_C
|
||||
INSERT INTO pm_project_user (pm_project_user_id, userid, pm_projectid) VALUES
|
||||
('mu000000-0000-0000-0000-000000000001', 'USER_PM', 'PRJ_A'),
|
||||
('mu000000-0000-0000-0000-000000000002', 'USER_PM', 'PRJ_B'),
|
||||
('mu000000-0000-0000-0000-000000000003', 'USER_BOB', 'PRJ_C');
|
||||
|
||||
-- ===========================================================================
|
||||
-- 3. 多维受控实体的自描述元数据 + 物理表
|
||||
-- 实体表(均含标准列 ISACTIVE/CREATETIME/UPDATETIME/CREATEBY/UPDATEBY/VERSION):
|
||||
-- EIP4PT_MDDEPT —— 单维:部门(CURRENTUSERDEPARTID)
|
||||
-- EIP4PT_MDORG —— 单维:组织(CURRENTUSERORGID)
|
||||
-- EIP4PT_MDSPECDEPT —— 单维:指定部门集(SPECIALDEPART,引擎未被客户用,补全覆盖)
|
||||
-- EIP4PT_MDPROJECT —— 单维:项目负责人(OWNNERPROJECT)
|
||||
-- EIP4PT_MDCOMBO —— 多条件 op 串联:部门 AND 项目(混合 CURRENTUSERDEPARTID + OWNNERPROJECT)
|
||||
-- EIP4PT_MDOR —— 多规则角色 OR:两条规则(角色不同)
|
||||
-- EIP4PT_SUBCONTRACT—— 建筑三维:项目×组织×分包商(OWNER/DEPARTID/PROJECTID/SUBCONTRACTORID)
|
||||
-- ===========================================================================
|
||||
|
||||
-- ---- 3.1 物理表 ----
|
||||
CREATE TABLE eip4pt_mddept (
|
||||
eip4pt_mddept_id character(36) NOT NULL, bizno character varying(50), departid character varying(36),
|
||||
isactive integer DEFAULT 1 NOT NULL, createtime bigint, updatetime bigint,
|
||||
createby character(36), updateby character(36), version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (eip4pt_mddept_id));
|
||||
CREATE TABLE eip4pt_mdorg (
|
||||
eip4pt_mdorg_id character(36) NOT NULL, bizno character varying(50), orgid character varying(36),
|
||||
isactive integer DEFAULT 1 NOT NULL, createtime bigint, updatetime bigint,
|
||||
createby character(36), updateby character(36), version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (eip4pt_mdorg_id));
|
||||
CREATE TABLE eip4pt_mdspecdept (
|
||||
eip4pt_mdspecdept_id character(36) NOT NULL, bizno character varying(50), departid character varying(36),
|
||||
isactive integer DEFAULT 1 NOT NULL, createtime bigint, updatetime bigint,
|
||||
createby character(36), updateby character(36), version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (eip4pt_mdspecdept_id));
|
||||
CREATE TABLE eip4pt_mdproject (
|
||||
eip4pt_mdproject_id character(36) NOT NULL, bizno character varying(50), projectid character varying(36),
|
||||
isactive integer DEFAULT 1 NOT NULL, createtime bigint, updatetime bigint,
|
||||
createby character(36), updateby character(36), version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (eip4pt_mdproject_id));
|
||||
CREATE TABLE eip4pt_mdcombo (
|
||||
eip4pt_mdcombo_id character(36) NOT NULL, bizno character varying(50),
|
||||
departid character varying(36), projectid character varying(36),
|
||||
isactive integer DEFAULT 1 NOT NULL, createtime bigint, updatetime bigint,
|
||||
createby character(36), updateby character(36), version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (eip4pt_mdcombo_id));
|
||||
CREATE TABLE eip4pt_mdor (
|
||||
eip4pt_mdor_id character(36) NOT NULL, bizno character varying(50),
|
||||
owner character varying(36), departid character varying(36),
|
||||
isactive integer DEFAULT 1 NOT NULL, createtime bigint, updatetime bigint,
|
||||
createby character(36), updateby character(36), version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (eip4pt_mdor_id));
|
||||
-- 建筑三维:分包商台账 项目×组织×部门×分包商 + OWNER
|
||||
CREATE TABLE eip4pt_subcontract (
|
||||
eip4pt_subcontract_id character(36) NOT NULL, bizno character varying(50),
|
||||
owner character varying(36), departid character varying(36),
|
||||
projectid character varying(36), subcontractorid character varying(36),
|
||||
isactive integer DEFAULT 1 NOT NULL, createtime bigint, updatetime bigint,
|
||||
createby character(36), updateby character(36), version integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY (eip4pt_subcontract_id));
|
||||
|
||||
-- ---- 3.2 sys_entity 行 ----
|
||||
INSERT INTO sys_entity
|
||||
(sys_entity_id, name, description, tablename, entitytype, isview, ischangelog,
|
||||
accesslevel, tabletype, isactive, createtime, updatetime, createby, updateby, version)
|
||||
VALUES
|
||||
('emd00000-0000-0000-0000-000000000001', '多维-部门', 'P2-4 单维部门', 'EIP4PT_MDDEPT', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0),
|
||||
('emd00000-0000-0000-0000-000000000002', '多维-组织', 'P2-4 单维组织', 'EIP4PT_MDORG', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0),
|
||||
('emd00000-0000-0000-0000-000000000003', '多维-指定部门', 'P2-4 SPECIALDEPART', 'EIP4PT_MDSPECDEPT', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0),
|
||||
('emd00000-0000-0000-0000-000000000004', '多维-项目', 'P2-4 OWNNERPROJECT', 'EIP4PT_MDPROJECT', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0),
|
||||
('emd00000-0000-0000-0000-000000000005', '多维-部门AND项目', 'P2-4 op串联', 'EIP4PT_MDCOMBO', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0),
|
||||
('emd00000-0000-0000-0000-000000000006', '多维-角色OR', 'P2-4 多规则OR', 'EIP4PT_MDOR', 'a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0),
|
||||
('emd00000-0000-0000-0000-000000000007', '分包商台账', 'P2-4 建筑三维', 'EIP4PT_SUBCONTRACT','a0000000-0000-0000-0000-0000000000ff', 0, 0, 0, 0, 1, 0, 0, 'ADMIN', 'ADMIN', 0);
|
||||
|
||||
-- ---- 3.3 sys_entityattribute(每实体:主键 + 业务列 + 标准列;displayType 对齐物理类型)----
|
||||
-- 通用标准列宏:用一段函数化 INSERT 太繁琐,这里逐实体显式列出(seq 决定列序;isentitydisplay 第2列=1)。
|
||||
INSERT INTO sys_entityattribute
|
||||
(sys_entityattribute_id, entityid, columnname, displayname, referenceid,
|
||||
ismandatory, isreadonly, iskey, isidentifier, iscombidentifier, isentitydisplay,
|
||||
entitydisplayseq, fieldlength, isactive, createby, updateby, version)
|
||||
VALUES
|
||||
-- EIP4PT_MDDEPT
|
||||
('amd00000-0000-0000-0000-000000010001','emd00000-0000-0000-0000-000000000001','EIP4PT_MDDEPT_ID','主键','CHAR',1,1,1,0,0,0,1,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010002','emd00000-0000-0000-0000-000000000001','BIZNO','业务号','NVARCHAR',0,0,0,0,0,1,2,50,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010003','emd00000-0000-0000-0000-000000000001','DEPARTID','部门','NVARCHAR',0,0,0,0,0,0,3,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010004','emd00000-0000-0000-0000-000000000001','ISACTIVE','是否有效','BOOLEAN',0,0,0,0,0,0,4,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010005','emd00000-0000-0000-0000-000000000001','CREATETIME','创建时间','TIME',0,0,0,0,0,0,5,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010006','emd00000-0000-0000-0000-000000000001','UPDATETIME','更新时间','TIME',0,0,0,0,0,0,6,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010007','emd00000-0000-0000-0000-000000000001','CREATEBY','创建人','NVARCHAR',0,0,0,0,0,0,7,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010008','emd00000-0000-0000-0000-000000000001','UPDATEBY','更新人','NVARCHAR',0,0,0,0,0,0,8,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000010009','emd00000-0000-0000-0000-000000000001','VERSION','版本','INTEGER',0,0,0,0,0,0,9,0,1,'ADMIN','ADMIN',0),
|
||||
-- EIP4PT_MDORG
|
||||
('amd00000-0000-0000-0000-000000020001','emd00000-0000-0000-0000-000000000002','EIP4PT_MDORG_ID','主键','CHAR',1,1,1,0,0,0,1,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020002','emd00000-0000-0000-0000-000000000002','BIZNO','业务号','NVARCHAR',0,0,0,0,0,1,2,50,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020003','emd00000-0000-0000-0000-000000000002','ORGID','组织','NVARCHAR',0,0,0,0,0,0,3,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020004','emd00000-0000-0000-0000-000000000002','ISACTIVE','是否有效','BOOLEAN',0,0,0,0,0,0,4,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020005','emd00000-0000-0000-0000-000000000002','CREATETIME','创建时间','TIME',0,0,0,0,0,0,5,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020006','emd00000-0000-0000-0000-000000000002','UPDATETIME','更新时间','TIME',0,0,0,0,0,0,6,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020007','emd00000-0000-0000-0000-000000000002','CREATEBY','创建人','NVARCHAR',0,0,0,0,0,0,7,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020008','emd00000-0000-0000-0000-000000000002','UPDATEBY','更新人','NVARCHAR',0,0,0,0,0,0,8,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000020009','emd00000-0000-0000-0000-000000000002','VERSION','版本','INTEGER',0,0,0,0,0,0,9,0,1,'ADMIN','ADMIN',0),
|
||||
-- EIP4PT_MDSPECDEPT
|
||||
('amd00000-0000-0000-0000-000000030001','emd00000-0000-0000-0000-000000000003','EIP4PT_MDSPECDEPT_ID','主键','CHAR',1,1,1,0,0,0,1,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030002','emd00000-0000-0000-0000-000000000003','BIZNO','业务号','NVARCHAR',0,0,0,0,0,1,2,50,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030003','emd00000-0000-0000-0000-000000000003','DEPARTID','部门','NVARCHAR',0,0,0,0,0,0,3,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030004','emd00000-0000-0000-0000-000000000003','ISACTIVE','是否有效','BOOLEAN',0,0,0,0,0,0,4,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030005','emd00000-0000-0000-0000-000000000003','CREATETIME','创建时间','TIME',0,0,0,0,0,0,5,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030006','emd00000-0000-0000-0000-000000000003','UPDATETIME','更新时间','TIME',0,0,0,0,0,0,6,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030007','emd00000-0000-0000-0000-000000000003','CREATEBY','创建人','NVARCHAR',0,0,0,0,0,0,7,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030008','emd00000-0000-0000-0000-000000000003','UPDATEBY','更新人','NVARCHAR',0,0,0,0,0,0,8,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000030009','emd00000-0000-0000-0000-000000000003','VERSION','版本','INTEGER',0,0,0,0,0,0,9,0,1,'ADMIN','ADMIN',0),
|
||||
-- EIP4PT_MDPROJECT
|
||||
('amd00000-0000-0000-0000-000000040001','emd00000-0000-0000-0000-000000000004','EIP4PT_MDPROJECT_ID','主键','CHAR',1,1,1,0,0,0,1,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040002','emd00000-0000-0000-0000-000000000004','BIZNO','业务号','NVARCHAR',0,0,0,0,0,1,2,50,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040003','emd00000-0000-0000-0000-000000000004','PROJECTID','项目','NVARCHAR',0,0,0,0,0,0,3,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040004','emd00000-0000-0000-0000-000000000004','ISACTIVE','是否有效','BOOLEAN',0,0,0,0,0,0,4,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040005','emd00000-0000-0000-0000-000000000004','CREATETIME','创建时间','TIME',0,0,0,0,0,0,5,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040006','emd00000-0000-0000-0000-000000000004','UPDATETIME','更新时间','TIME',0,0,0,0,0,0,6,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040007','emd00000-0000-0000-0000-000000000004','CREATEBY','创建人','NVARCHAR',0,0,0,0,0,0,7,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040008','emd00000-0000-0000-0000-000000000004','UPDATEBY','更新人','NVARCHAR',0,0,0,0,0,0,8,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000040009','emd00000-0000-0000-0000-000000000004','VERSION','版本','INTEGER',0,0,0,0,0,0,9,0,1,'ADMIN','ADMIN',0),
|
||||
-- EIP4PT_MDCOMBO
|
||||
('amd00000-0000-0000-0000-000000050001','emd00000-0000-0000-0000-000000000005','EIP4PT_MDCOMBO_ID','主键','CHAR',1,1,1,0,0,0,1,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050002','emd00000-0000-0000-0000-000000000005','BIZNO','业务号','NVARCHAR',0,0,0,0,0,1,2,50,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050003','emd00000-0000-0000-0000-000000000005','DEPARTID','部门','NVARCHAR',0,0,0,0,0,0,3,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050004','emd00000-0000-0000-0000-000000000005','PROJECTID','项目','NVARCHAR',0,0,0,0,0,0,4,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050005','emd00000-0000-0000-0000-000000000005','ISACTIVE','是否有效','BOOLEAN',0,0,0,0,0,0,5,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050006','emd00000-0000-0000-0000-000000000005','CREATETIME','创建时间','TIME',0,0,0,0,0,0,6,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050007','emd00000-0000-0000-0000-000000000005','UPDATETIME','更新时间','TIME',0,0,0,0,0,0,7,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050008','emd00000-0000-0000-0000-000000000005','CREATEBY','创建人','NVARCHAR',0,0,0,0,0,0,8,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050009','emd00000-0000-0000-0000-000000000005','UPDATEBY','更新人','NVARCHAR',0,0,0,0,0,0,9,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000050010','emd00000-0000-0000-0000-000000000005','VERSION','版本','INTEGER',0,0,0,0,0,0,10,0,1,'ADMIN','ADMIN',0),
|
||||
-- EIP4PT_MDOR
|
||||
('amd00000-0000-0000-0000-000000060001','emd00000-0000-0000-0000-000000000006','EIP4PT_MDOR_ID','主键','CHAR',1,1,1,0,0,0,1,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060002','emd00000-0000-0000-0000-000000000006','BIZNO','业务号','NVARCHAR',0,0,0,0,0,1,2,50,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060003','emd00000-0000-0000-0000-000000000006','OWNER','负责人','NVARCHAR',0,0,0,0,0,0,3,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060004','emd00000-0000-0000-0000-000000000006','DEPARTID','部门','NVARCHAR',0,0,0,0,0,0,4,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060005','emd00000-0000-0000-0000-000000000006','ISACTIVE','是否有效','BOOLEAN',0,0,0,0,0,0,5,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060006','emd00000-0000-0000-0000-000000000006','CREATETIME','创建时间','TIME',0,0,0,0,0,0,6,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060007','emd00000-0000-0000-0000-000000000006','UPDATETIME','更新时间','TIME',0,0,0,0,0,0,7,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060008','emd00000-0000-0000-0000-000000000006','CREATEBY','创建人','NVARCHAR',0,0,0,0,0,0,8,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060009','emd00000-0000-0000-0000-000000000006','UPDATEBY','更新人','NVARCHAR',0,0,0,0,0,0,9,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000060010','emd00000-0000-0000-0000-000000000006','VERSION','版本','INTEGER',0,0,0,0,0,0,10,0,1,'ADMIN','ADMIN',0),
|
||||
-- EIP4PT_SUBCONTRACT
|
||||
('amd00000-0000-0000-0000-000000070001','emd00000-0000-0000-0000-000000000007','EIP4PT_SUBCONTRACT_ID','主键','CHAR',1,1,1,0,0,0,1,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070002','emd00000-0000-0000-0000-000000000007','BIZNO','业务号','NVARCHAR',0,0,0,0,0,1,2,50,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070003','emd00000-0000-0000-0000-000000000007','OWNER','负责人','NVARCHAR',0,0,0,0,0,0,3,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070004','emd00000-0000-0000-0000-000000000007','DEPARTID','部门','NVARCHAR',0,0,0,0,0,0,4,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070005','emd00000-0000-0000-0000-000000000007','PROJECTID','项目','NVARCHAR',0,0,0,0,0,0,5,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070006','emd00000-0000-0000-0000-000000000007','SUBCONTRACTORID','分包商','NVARCHAR',0,0,0,0,0,0,6,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070007','emd00000-0000-0000-0000-000000000007','ISACTIVE','是否有效','BOOLEAN',0,0,0,0,0,0,7,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070008','emd00000-0000-0000-0000-000000000007','CREATETIME','创建时间','TIME',0,0,0,0,0,0,8,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070009','emd00000-0000-0000-0000-000000000007','UPDATETIME','更新时间','TIME',0,0,0,0,0,0,9,0,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070010','emd00000-0000-0000-0000-000000000007','CREATEBY','创建人','NVARCHAR',0,0,0,0,0,0,10,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070011','emd00000-0000-0000-0000-000000000007','UPDATEBY','更新人','NVARCHAR',0,0,0,0,0,0,11,36,1,'ADMIN','ADMIN',0),
|
||||
('amd00000-0000-0000-0000-000000070012','emd00000-0000-0000-0000-000000000007','VERSION','版本','INTEGER',0,0,0,0,0,0,12,0,1,'ADMIN','ADMIN',0);
|
||||
|
||||
-- ===========================================================================
|
||||
-- 4. 种子数据(确定性,可重复:固定 id;CREATEBY 全置 ADMIN 不参与过滤)
|
||||
-- 维度取值:部门 DEP_1/DEP_2;组织 ORG_1/ORG_2;项目 PRJ_A/PRJ_B/PRJ_C;
|
||||
-- 负责人 USER_PM/USER_BOB;分包商 SUB_1/SUB_2。
|
||||
-- ===========================================================================
|
||||
-- 4.1 EIP4PT_MDDEPT(6 行,DEP_1×3 / DEP_2×3)
|
||||
INSERT INTO eip4pt_mddept (eip4pt_mddept_id, bizno, departid, createby) VALUES
|
||||
('md100000-0000-0000-0000-000000000001','D-01','DEP_1','ADMIN'),
|
||||
('md100000-0000-0000-0000-000000000002','D-02','DEP_1','ADMIN'),
|
||||
('md100000-0000-0000-0000-000000000003','D-03','DEP_1','ADMIN'),
|
||||
('md100000-0000-0000-0000-000000000004','D-04','DEP_2','ADMIN'),
|
||||
('md100000-0000-0000-0000-000000000005','D-05','DEP_2','ADMIN'),
|
||||
('md100000-0000-0000-0000-000000000006','D-06','DEP_2','ADMIN');
|
||||
-- 4.2 EIP4PT_MDORG(6 行,ORG_1×4 / ORG_2×2)
|
||||
INSERT INTO eip4pt_mdorg (eip4pt_mdorg_id, bizno, orgid, createby) VALUES
|
||||
('md200000-0000-0000-0000-000000000001','O-01','ORG_1','ADMIN'),
|
||||
('md200000-0000-0000-0000-000000000002','O-02','ORG_1','ADMIN'),
|
||||
('md200000-0000-0000-0000-000000000003','O-03','ORG_1','ADMIN'),
|
||||
('md200000-0000-0000-0000-000000000004','O-04','ORG_1','ADMIN'),
|
||||
('md200000-0000-0000-0000-000000000005','O-05','ORG_2','ADMIN'),
|
||||
('md200000-0000-0000-0000-000000000006','O-06','ORG_2','ADMIN');
|
||||
-- 4.3 EIP4PT_MDSPECDEPT(6 行,DEP_1/DEP_2/DEP_3 各 2)
|
||||
INSERT INTO eip4pt_mdspecdept (eip4pt_mdspecdept_id, bizno, departid, createby) VALUES
|
||||
('md300000-0000-0000-0000-000000000001','S-01','DEP_1','ADMIN'),
|
||||
('md300000-0000-0000-0000-000000000002','S-02','DEP_1','ADMIN'),
|
||||
('md300000-0000-0000-0000-000000000003','S-03','DEP_2','ADMIN'),
|
||||
('md300000-0000-0000-0000-000000000004','S-04','DEP_2','ADMIN'),
|
||||
('md300000-0000-0000-0000-000000000005','S-05','DEP_3','ADMIN'),
|
||||
('md300000-0000-0000-0000-000000000006','S-06','DEP_3','ADMIN');
|
||||
-- 4.4 EIP4PT_MDPROJECT(6 行,PRJ_A×2 / PRJ_B×2 / PRJ_C×2)
|
||||
INSERT INTO eip4pt_mdproject (eip4pt_mdproject_id, bizno, projectid, createby) VALUES
|
||||
('md400000-0000-0000-0000-000000000001','P-01','PRJ_A','ADMIN'),
|
||||
('md400000-0000-0000-0000-000000000002','P-02','PRJ_A','ADMIN'),
|
||||
('md400000-0000-0000-0000-000000000003','P-03','PRJ_B','ADMIN'),
|
||||
('md400000-0000-0000-0000-000000000004','P-04','PRJ_B','ADMIN'),
|
||||
('md400000-0000-0000-0000-000000000005','P-05','PRJ_C','ADMIN'),
|
||||
('md400000-0000-0000-0000-000000000006','P-06','PRJ_C','ADMIN');
|
||||
-- 4.5 EIP4PT_MDCOMBO(部门×项目 笛卡尔覆盖,8 行)
|
||||
INSERT INTO eip4pt_mdcombo (eip4pt_mdcombo_id, bizno, departid, projectid, createby) VALUES
|
||||
('md500000-0000-0000-0000-000000000001','C-01','DEP_1','PRJ_A','ADMIN'),
|
||||
('md500000-0000-0000-0000-000000000002','C-02','DEP_1','PRJ_B','ADMIN'),
|
||||
('md500000-0000-0000-0000-000000000003','C-03','DEP_1','PRJ_C','ADMIN'),
|
||||
('md500000-0000-0000-0000-000000000004','C-04','DEP_2','PRJ_A','ADMIN'),
|
||||
('md500000-0000-0000-0000-000000000005','C-05','DEP_2','PRJ_B','ADMIN'),
|
||||
('md500000-0000-0000-0000-000000000006','C-06','DEP_2','PRJ_C','ADMIN'),
|
||||
('md500000-0000-0000-0000-000000000007','C-07','DEP_1','PRJ_A','ADMIN'),
|
||||
('md500000-0000-0000-0000-000000000008','C-08','DEP_2','PRJ_C','ADMIN');
|
||||
-- 4.6 EIP4PT_MDOR(负责人/部门两维,供两条规则角色 OR;6 行)
|
||||
INSERT INTO eip4pt_mdor (eip4pt_mdor_id, bizno, owner, departid, createby) VALUES
|
||||
('md600000-0000-0000-0000-000000000001','R-01','USER_PM', 'DEP_9','ADMIN'),
|
||||
('md600000-0000-0000-0000-000000000002','R-02','USER_PM', 'DEP_9','ADMIN'),
|
||||
('md600000-0000-0000-0000-000000000003','R-03','USER_X', 'DEP_1','ADMIN'),
|
||||
('md600000-0000-0000-0000-000000000004','R-04','USER_X', 'DEP_1','ADMIN'),
|
||||
('md600000-0000-0000-0000-000000000005','R-05','USER_Y', 'DEP_2','ADMIN'),
|
||||
('md600000-0000-0000-0000-000000000006','R-06','USER_Z', 'DEP_3','ADMIN');
|
||||
-- 4.7 EIP4PT_SUBCONTRACT(建筑三维,12 行;OWNER/DEPARTID/PROJECTID/SUBCONTRACTORID 交叉)
|
||||
INSERT INTO eip4pt_subcontract (eip4pt_subcontract_id, bizno, owner, departid, projectid, subcontractorid, createby) VALUES
|
||||
('md700000-0000-0000-0000-000000000001','SC-01','USER_PM', 'DEP_1','PRJ_A','SUB_1','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000002','SC-02','USER_PM', 'DEP_1','PRJ_A','SUB_2','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000003','SC-03','USER_PM', 'DEP_2','PRJ_B','SUB_1','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000004','SC-04','USER_BOB','DEP_1','PRJ_C','SUB_1','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000005','SC-05','USER_BOB','DEP_2','PRJ_C','SUB_2','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000006','SC-06','USER_X', 'DEP_1','PRJ_A','SUB_1','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000007','SC-07','USER_X', 'DEP_2','PRJ_B','SUB_2','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000008','SC-08','USER_Y', 'DEP_3','PRJ_C','SUB_1','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000009','SC-09','USER_PM', 'DEP_1','PRJ_B','SUB_2','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000010','SC-10','USER_BOB','DEP_1','PRJ_A','SUB_1','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000011','SC-11','USER_X', 'DEP_1','PRJ_C','SUB_2','ADMIN'),
|
||||
('md700000-0000-0000-0000-000000000012','SC-12','USER_Y', 'DEP_2','PRJ_A','SUB_1','ADMIN');
|
||||
|
||||
-- ===========================================================================
|
||||
-- 5. 规则矩阵 —— 覆盖普查发现的真实形态 + 引擎支持但客户未用的形态
|
||||
-- 规则 ENTITYID 动态取自 sys_entity(实体 id 已硬编码为 emd00000-...,可直接用)。
|
||||
-- op 串联:同规则内多 conditional 用 op 字段(AND/OR);多规则同实体由不同 sys_filterrule 行 + 角色实现。
|
||||
-- ===========================================================================
|
||||
-- 5.1 单维-部门:DEPARTID = {CURRENTUSERDEPARTID} (角色 ROLE_DEPT)
|
||||
INSERT INTO sys_filterrule (sys_filterrule_id, entityid, filterrule, isactive, createtime, updatetime, createby, updateby, version) VALUES
|
||||
('m1000000-0000-0000-0000-000000000001','emd00000-0000-0000-0000-000000000001',
|
||||
'[{"preConditional":"DEPARTID","sign":"=","backConditional":"{CURRENTUSERDEPARTID}","type":"CURRENTUSERDEPARTID","op":null}]',1,0,0,'ADMIN','ADMIN',0);
|
||||
-- 5.2 单维-组织:ORGID = {CURRENTUSERORGID} (角色 ROLE_ORG)
|
||||
INSERT INTO sys_filterrule (sys_filterrule_id, entityid, filterrule, isactive, createtime, updatetime, createby, updateby, version) VALUES
|
||||
('m1000000-0000-0000-0000-000000000002','emd00000-0000-0000-0000-000000000002',
|
||||
'[{"preConditional":"ORGID","sign":"=","backConditional":"{CURRENTUSERORGID}","type":"CURRENTUSERORGID","op":null}]',1,0,0,'ADMIN','ADMIN',0);
|
||||
-- 5.3 单维-指定部门集:DEPARTID in (DEP_1,DEP_2) (SPECIALDEPART;sign 任意,引擎强制 in;角色 ROLE_SPEC)
|
||||
INSERT INTO sys_filterrule (sys_filterrule_id, entityid, filterrule, isactive, createtime, updatetime, createby, updateby, version) VALUES
|
||||
('m1000000-0000-0000-0000-000000000003','emd00000-0000-0000-0000-000000000003',
|
||||
'[{"preConditional":"DEPARTID","sign":"in","backConditional":"DEP_1,DEP_2","type":"SPECIALDEPART","op":null}]',1,0,0,'ADMIN','ADMIN',0);
|
||||
-- 5.4 单维-项目负责人:PROJECTID in (我负责的项目) (OWNNERPROJECT;角色 ROLE_PROJ)
|
||||
INSERT INTO sys_filterrule (sys_filterrule_id, entityid, filterrule, isactive, createtime, updatetime, createby, updateby, version) VALUES
|
||||
('m1000000-0000-0000-0000-000000000004','emd00000-0000-0000-0000-000000000004',
|
||||
'[{"preConditional":"PROJECTID","sign":"in","backConditional":"{OWNNERPROJECT}","type":"OWNNERPROJECT","op":null}]',1,0,0,'ADMIN','ADMIN',0);
|
||||
-- 5.5 多条件 op=AND 串联:DEPARTID={CURRENTUSERDEPARTID} AND PROJECTID in(我负责) (角色 ROLE_COMBO)
|
||||
INSERT INTO sys_filterrule (sys_filterrule_id, entityid, filterrule, isactive, createtime, updatetime, createby, updateby, version) VALUES
|
||||
('m1000000-0000-0000-0000-000000000005','emd00000-0000-0000-0000-000000000005',
|
||||
'[{"preConditional":"DEPARTID","sign":"=","backConditional":"{CURRENTUSERDEPARTID}","type":"CURRENTUSERDEPARTID","op":"AND"},{"preConditional":"PROJECTID","sign":"in","backConditional":"{OWNNERPROJECT}","type":"OWNNERPROJECT","op":null}]',1,0,0,'ADMIN','ADMIN',0);
|
||||
-- 5.6 多规则角色 OR:同实体两条规则
|
||||
-- 规则 A(角色 ROLE_OR_A):OWNER = {CURRENTUSERID}
|
||||
-- 规则 B(角色 ROLE_OR_B):DEPARTID = {CURRENTUSERDEPARTID}
|
||||
INSERT INTO sys_filterrule (sys_filterrule_id, entityid, filterrule, isactive, createtime, updatetime, createby, updateby, version) VALUES
|
||||
('m1000000-0000-0000-0000-000000000061','emd00000-0000-0000-0000-000000000006',
|
||||
'[{"preConditional":"OWNER","sign":"=","backConditional":"{CURRENTUSERID}","type":"CURRENTUSERID","op":null}]',1,0,0,'ADMIN','ADMIN',0),
|
||||
('m1000000-0000-0000-0000-000000000062','emd00000-0000-0000-0000-000000000006',
|
||||
'[{"preConditional":"DEPARTID","sign":"=","backConditional":"{CURRENTUSERDEPARTID}","type":"CURRENTUSERDEPARTID","op":null}]',1,0,0,'ADMIN','ADMIN',0);
|
||||
-- 5.7 建筑三维(单规则 3 条件 op=AND 串联):
|
||||
-- OWNER={CURRENTUSERID} AND DEPARTID={CURRENTUSERDEPARTID} AND PROJECTID in(我负责) (角色 ROLE_SUB)
|
||||
INSERT INTO sys_filterrule (sys_filterrule_id, entityid, filterrule, isactive, createtime, updatetime, createby, updateby, version) VALUES
|
||||
('m1000000-0000-0000-0000-000000000007','emd00000-0000-0000-0000-000000000007',
|
||||
'[{"preConditional":"OWNER","sign":"=","backConditional":"{CURRENTUSERID}","type":"CURRENTUSERID","op":"AND"},{"preConditional":"DEPARTID","sign":"=","backConditional":"{CURRENTUSERDEPARTID}","type":"CURRENTUSERDEPARTID","op":"AND"},{"preConditional":"PROJECTID","sign":"in","backConditional":"{OWNNERPROJECT}","type":"OWNNERPROJECT","op":null}]',1,0,0,'ADMIN','ADMIN',0);
|
||||
|
||||
-- 规则↔角色(中间表)
|
||||
INSERT INTO sys_filterrulerole (filterruleid, roleid) VALUES
|
||||
('m1000000-0000-0000-0000-000000000001','ROLE_DEPT'),
|
||||
('m1000000-0000-0000-0000-000000000002','ROLE_ORG'),
|
||||
('m1000000-0000-0000-0000-000000000003','ROLE_SPEC'),
|
||||
('m1000000-0000-0000-0000-000000000004','ROLE_PROJ'),
|
||||
('m1000000-0000-0000-0000-000000000005','ROLE_COMBO'),
|
||||
('m1000000-0000-0000-0000-000000000061','ROLE_OR_A'),
|
||||
('m1000000-0000-0000-0000-000000000062','ROLE_OR_B'),
|
||||
('m1000000-0000-0000-0000-000000000007','ROLE_SUB');
|
||||
Reference in New Issue
Block a user