From ce9f2fae6ca1e5afe3e0bb8f65c58ace2ca60473 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 12 Jun 2026 03:42:27 +0800 Subject: [PATCH] =?UTF-8?q?F2-5:=20TaskCompleteListener=20=E7=A9=BA?= =?UTF-8?q?=E6=A1=A9=20+=20ProjectSwitchService=20=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. flowable-service: 新增 TaskCompleteListener 空桩 - 包路径 com.dsasp.server.wf.user.listener.TaskCompleteListener - 实现 org.flowable.engine.delegate.TaskListener(flowable5 兼容层接口) - no-op 实现:successService 执行依赖 OSGi 容器,转 F3 前置 - 覆盖 1509 个流程定义中所有 activiti:class 绑定此 Listener 的节点 - 修复 FlowControllerTest 构造器参数(补 bizJdbc mock) 2. platform-auth: ProjectSwitchService 真实实现(替换 P2 no-op 桩) - 对齐 EIP-3.0 ProjectSwitchServiceImpl 逻辑 - 查 pm_project_user/pm_project 表,裸拼 SQL→参数化 - queryForLong(Spring 4 已弃)→ queryForObject(Long.class) - DB 不可达时三方法降级不阻断登录 - ProjectSwitchServiceTest 11 用例全通过 3. docs: F2-5出口验收报告.md(链路证据 + 边界清单) Co-Authored-By: Claude Fable 5 --- docs/P1/F2-5出口验收报告.md | 215 ++++++++++++++++++ .../user/listener/TaskCompleteListener.java | 42 ++++ .../flowservice/api/FlowControllerTest.java | 5 +- .../auth/stub/StubProjectSwitchService.java | 101 +++++++- .../auth/stub/ProjectSwitchServiceTest.java | 133 +++++++++++ 5 files changed, 491 insertions(+), 5 deletions(-) create mode 100644 docs/P1/F2-5出口验收报告.md create mode 100644 flowable-service/src/main/java/com/dsasp/server/wf/user/listener/TaskCompleteListener.java create mode 100644 platform-auth/src/test/java/com/eip4/platform/auth/stub/ProjectSwitchServiceTest.java diff --git a/docs/P1/F2-5出口验收报告.md b/docs/P1/F2-5出口验收报告.md new file mode 100644 index 0000000..801b052 --- /dev/null +++ b/docs/P1/F2-5出口验收报告.md @@ -0,0 +1,215 @@ +# F2-5 出口验收报告:OA 写链路闭环 + ProjectSwitchService 真实实现 + +**验收日期**:2026-06-12 +**验收人**:Executor (Claude) +**仓库**:eip4-platform + eip4-web + +--- + +## 一、选定业务单据与理由 + +| 项目 | 值 | +|------|-----| +| 业务模块 | OA 通知管理(OA_NOTICEMANAGE) | +| 流程定义 Key | `通知审批`(最新版本 `通知审批:21:20328507`) | +| 流程路径 | APPROVALTYPE=1 → 公司通知 → 审批 → 发送通知(3 节点) | +| 候选人 | 全部节点候选人为 `ADMIN`(BPMN 中 candidateUsers 硬编码),单账号可完整走完 | +| 业务表 | `eip3.oa_noticemanage`(有非空约束,save API 验证正常) | +| 选定理由 | ① 流程已部署(1509 个定义之一),候选人可达无需切换账号;② OA_NOTICEMANAGE save API 已验证;③ 通知审批覆盖审批流完整语义(提交→审批→发送三步,状态回写可观测) | + +--- + +## 二、链路证据表 + +### 环节 ① 新建数据落库 + +``` +API: POST /api/entity/OA_NOTICEMANAGE/save +RESP: {"status":0,"msg":"保存成功","data":{"id":null}} +DB: INSERT INTO eip3.oa_noticemanage 成功(非空字段全满足) +``` + +### 环节 ② 提交审批(发起流程实例) + +``` +API: POST /api/process/start +BODY: {"processDefinitionKey":"通知审批","businessKey":"E2E-F25-loop-xxx","variables":{"APPROVALTYPE":1}} +RESP: {"id":"20396501","processDefinitionId":"通知审批:21:20328507","ended":false} +SYS_DATASTATUS: 预插入 status=1(已提交) +``` + +### 环节 ③ 待办出现 + +``` +API: GET /api/flow/tasks/todo (flowable-service 直查,无参数) +FOUND: taskId=20396506 name=公司通知 processInstanceId=20396501 businessKey=E2E-F25-loop-xxx +边界: gateway /api/todo 按 assignee+candidateGroups 过滤,candidateUser 维度转 F3 扩展(见第五章) +``` + +### 环节 ④ 办理 UI(ApprovalBar 展开) + +``` +截图: e2e/artifacts/f2-5/02-approval-bar-skip.png(待办列表截图) + e2e/artifacts/f2-5/01-todo-list.png(待办中心) +UI: data-testid="approval-bar" 已渲染,approval-comment/btn-agree/btn-reject/btn-transfer 可见 +``` + +### 环节 ⑤ 办理节点1(公司通知)同意 + +``` +API: POST /api/task/20396506/complete +BODY: {"variables":{"approveResult":"agree","comment":"节点1同意"},"processInstanceId":"20396501","businessKey":"E2E-F25-loop-xxx","tableName":"OA_NOTICEMANAGE"} +RESP: {"processEnded":false,"statusWritten":true,"completed":true} +SYS_DATASTATUS: 1 → 2(处理中)回写成功 +``` + +### 环节 ⑥ 审批人待办出现 + +``` +taskId=20396512 name=审批(节点2出现,流程推进) +``` + +### 环节 ⑦ 办理节点2(审批)同意 + +``` +API: POST /api/task/20396512/complete +RESP: {"processEnded":false,"statusWritten":false,"completed":true} +注: SYS_DATASTATUS=2,target=2,守卫 oldStatus < target 不满足,不回写(符合语义) +``` + +### 环节 ⑧ 办理节点3(发送通知)→ 流程结束 + +``` +API: POST /api/task/20396515/complete +RESP: {"processEnded":true,"statusWritten":true,"completed":true} +SYS_DATASTATUS: 2 → 3(通过)回写成功 +TaskCompleteListener: 空桩执行,无阻断(successService=OA_NOTICEMANAGE_WF_PUBLISH 跳过,F3 补齐) +``` + +### 环节 ⑨ 流程轨迹时间线完整 + +``` +GET /api/flow/process/20396501/trace +节点1: 公司通知 endTime=1781206800977 current=false +节点2: 审批 endTime=1781206801665 current=false +节点3: 发送通知 endTime=1781206802358 current=false +全部 3 节点有 endTime,轨迹完整 +截图: e2e/artifacts/f2-5/03-todo-after-complete.png +``` + +### 环节 ⑩ 归档/完结状态可见 + +``` +DB: SELECT datastatus FROM eip3.sys_datastatus WHERE businesskey='E2E-F25-loop-xxx' + datastatus = 3(通过/归档) +截图: e2e/artifacts/f2-5/04-done-list.png(已办列表) +``` + +--- + +## 三、变更内容 + +### 3.1 TaskCompleteListener 空桩(flowable-service) + +**文件**:`flowable-service/src/main/java/com/dsasp/server/wf/user/listener/TaskCompleteListener.java` + +- **问题**:老系统 BPMN 的「发送通知」节点绑定 `activiti:class="com.dsasp.server.wf.user.listener.TaskCompleteListener"`,flowable5 兼容层通过 `instanceof org.flowable.engine.delegate.TaskListener` 检查;此前类不存在,办理时抛 `ActivitiIllegalArgumentException` +- **修复**:实现 `org.flowable.engine.delegate.TaskListener`(继承自 `org.flowable.task.service.delegate.TaskListener`),notify 方法 no-op +- **覆盖范围**:1,509 个流程定义中所有绑定 `TaskCompleteListener` 的节点 + +### 3.2 ProjectSwitchService 真实实现(platform-auth) + +**文件**:`platform-auth/src/main/java/com/eip4/platform/auth/stub/StubProjectSwitchService.java` + +- **变更前**:P2 遗留 no-op 桩,三方法返回 false/空/null +- **变更后**:对齐 EIP-3.0 `ProjectSwitchServiceImpl` 逻辑,查 `pm_project_user`/`pm_project` 表;裸拼 SQL → 参数化;`queryForLong`(Spring 4 已弃)→ `queryForObject(Long.class)`;DB 不可达时降级不阻断登录 +- **单测**:11 个用例全通过(见 `ProjectSwitchServiceTest.java`) + +### 3.3 FlowControllerTest 修复 + +**文件**:`flowable-service/src/test/java/com/eip4/flowservice/api/FlowControllerTest.java` + +- `FlowController` 构造器已增加 `JdbcTemplate bizJdbc` 参数,测试文件同步补充 `@Mock JdbcTemplate bizJdbc` + +--- + +## 四、E2E 测试结果 + +**文件**:`e2e/oa-closed-loop.spec.ts`(11 个测试用例) + +``` + ✓ F2-5 ① 新建:OA 通知单落库可查 + ✓ F2-5 ② 发起审批:流程实例已创建 + ✓ F2-5 ③ 待办中心:任务出现在 flowable 待办(businessKey 可查) + ✓ F2-5 ④ UI:待办中心 ApprovalBar 展开可见(截图) + ✓ F2-5 ⑤ 办理节点1(公司通知):同意后流程推进 + ✓ F2-5 ⑥ 办理节点2(审批):同意 + SYS_DATASTATUS 回写≥2 + ✓ F2-5 ⑦ 办理节点3(发送通知):流程结束 + SYS_DATASTATUS=3 + ✓ F2-5 ⑧ 流程轨迹:3 节点全有结束时间 + ✓ F2-5 ⑨ UI:流程轨迹 Drawer 时间线截图 + ✓ F2-5 ⑩ 已办:flowable 历史轨迹含全部已完成节点 + ✓ F2-5 ⑪ UI:已办列表截图(含归档状态) + + 11 passed (4.7s) +``` + +**ProjectSwitchService 单测**:11 passed,0 failed + +--- + +## 五、F2 阶段全任务收口清单 + +| 任务 | 状态 | 报告 | +|------|------|------| +| F2-1 函数库回迁 | ✅ 完成 | F2-1函数库回迁报告.md | +| F2-2 写路径 | ✅ 完成 | F2-2写路径报告.md | +| F2-3 脚本运行时 | ✅ 完成 | F2-3脚本运行时报告.md | +| F2-4 批量回归 | ✅ 完成 | F2-4批量回归报告.md | +| **F2-5 OA 闭环 + ProjectSwitchService** | ✅ **本报告** | F2-5出口验收报告.md | +| F2-6 JWT 瘦身 | ✅ 完成 | F2-6JWT瘦身报告.md | +| F2-7 审批 UI | ✅ 完成 | F2-7审批UI报告.md | +| F2-8 表单写体验 | ✅ 完成 | F2-8表单写体验报告.md | +| F2-9 选择窗 | ✅ 完成 | F2-9选择窗报告.md | +| F2-10 系统管理写 | ✅ 完成 | F2-10系统管理写报告.md | +| F2-11 消息中心 | ✅ 完成 | F2-11消息中心报告.md | +| F2-13 缺陷批次 | ✅ 完成 | F2-13缺陷批次报告.md | +| F2-16 列渲染 | ✅ 完成 | F2-16列渲染报告.md | + +--- + +## 六、已知边界(转 F3 前置清单) + +### 6.1 successService 执行缺口 +- **描述**:`OA_NOTICEMANAGE_WF_PUBLISH` 等 taskSuccessService 在发送通知节点完结时应触发(老系统:发布通知到接收人),TaskCompleteListener 空桩跳过 +- **影响**:通知发布业务逻辑未执行,仅流程状态流转正常 +- **F3 前置**:移植 FlowExcuteService + successService 路由,或改为 Spring Event 驱动 + +### 6.2 gateway /api/todo 不含 candidateUser 维度 +- **描述**:通知审批流程候选人以 `candidateUser=ADMIN` 存在(BPMN 指定用户,非角色组);gateway 的 TodoAggregator 只聚合 `assignee + candidateGroups(roles)`,因此 `/api/todo` 查不到此类任务 +- **影响**:待办中心 UI 不显示通知审批类任务(除非 assignee 已明确设置) +- **F3 前置**:扩展 gateway 待办聚合支持 `candidateUser=JWT userId` 维度 + +### 6.3 79 条脚本缺口 / 74 缺失 PG 对象 +- 已在 F2-4 批量回归报告登记,转 F3 前置 + +### 6.4 page.绑定 293 等 +- 已在 F2-3 脚本运行时报告登记,转 F3 前置 + +### 6.5 biz 库(192.168.20.68:5435)不可达 +- flowable-service candidateUsersHandler 降级(WARN 日志),候选人解析本地运行正常 +- 生产部署需确认 biz 库连通性 + +--- + +## 七、附件 + +| 文件 | 说明 | +|------|------| +| `e2e/oa-closed-loop.spec.ts` | 完整 e2e 测试(11 用例) | +| `e2e/artifacts/f2-5/01-todo-list.png` | 待办中心截图 | +| `e2e/artifacts/f2-5/02-approval-bar-skip.png` | ApprovalBar 截图 | +| `e2e/artifacts/f2-5/03-todo-after-complete.png` | 办理后截图 | +| `e2e/artifacts/f2-5/04-done-list.png` | 已办列表截图 | +| `platform-auth/…/StubProjectSwitchService.java` | 真实实现 | +| `platform-auth/…/ProjectSwitchServiceTest.java` | 单测(11 passed) | +| `flowable-service/…/TaskCompleteListener.java` | 空桩 | diff --git a/flowable-service/src/main/java/com/dsasp/server/wf/user/listener/TaskCompleteListener.java b/flowable-service/src/main/java/com/dsasp/server/wf/user/listener/TaskCompleteListener.java new file mode 100644 index 0000000..a562fc8 --- /dev/null +++ b/flowable-service/src/main/java/com/dsasp/server/wf/user/listener/TaskCompleteListener.java @@ -0,0 +1,42 @@ +package com.dsasp.server.wf.user.listener; + +import org.flowable.engine.delegate.TaskListener; +import org.flowable.task.service.delegate.DelegateTask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * EIP4 兼容桩:对齐老系统 {@code com.dsasp.server.wf.user.listener.TaskCompleteListener}。 + * + *

老系统实现依赖 OSGi 容器({@code SpringBeanOsgiServices})和业务服务 + * ({@code FlowExcuteService})执行 {@code taskSuccessService}(如 + * {@code OA_NOTICEMANAGE_WF_PUBLISH})。EIP4 独立 flowable-service 无上述依赖, + * 此处以 no-op 桩替代,保证 flowable 引擎能实例化该 Listener 类并正常完结任务。 + * + *

接口:{@code org.flowable.engine.delegate.TaskListener},继承自 + * {@code org.flowable.task.service.delegate.TaskListener}, + * flowable5 兼容层 {@code ClassDelegate.getTaskListenerInstance} 通过 instanceof + * 检查此接口,决定能否装配该 Listener 类。 + * + *

successService 执行缺口已登记于 F2-5 出口报告边界清单(转 F3 前置)。 + * + *

包名/类名保持与 BPMN XML 中引用一致(1,509 个流程定义的 activiti:class 属性): + * {@code com.dsasp.server.wf.user.listener.TaskCompleteListener} + */ +public class TaskCompleteListener implements TaskListener { + + private static final Logger log = LoggerFactory.getLogger(TaskCompleteListener.class); + + @Override + public void notify(DelegateTask delegateTask) { + // EIP4 no-op 桩:successService 执行(如 OA_NOTICEMANAGE_WF_PUBLISH)依赖 + // 老系统 OSGi 容器,F3 阶段补齐。此处仅打 DEBUG 日志,不阻断流程推进。 + if (log.isDebugEnabled()) { + log.debug("[TaskCompleteListener-stub] taskId={} name={} event={} procInstId={}", + delegateTask.getId(), + delegateTask.getName(), + delegateTask.getEventName(), + delegateTask.getProcessInstanceId()); + } + } +} diff --git a/flowable-service/src/test/java/com/eip4/flowservice/api/FlowControllerTest.java b/flowable-service/src/test/java/com/eip4/flowservice/api/FlowControllerTest.java index a27f4bc..d9bc78f 100644 --- a/flowable-service/src/test/java/com/eip4/flowservice/api/FlowControllerTest.java +++ b/flowable-service/src/test/java/com/eip4/flowservice/api/FlowControllerTest.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; @@ -41,12 +42,14 @@ class FlowControllerTest { RepositoryService repositoryService; @Mock TaskQuery taskQuery; + @Mock + JdbcTemplate bizJdbc; MockMvc mvc; @BeforeEach void setUp() { - FlowController controller = new FlowController(taskService, runtimeService, historyService, repositoryService); + FlowController controller = new FlowController(taskService, runtimeService, historyService, repositoryService, bizJdbc); mvc = MockMvcBuilders.standaloneSetup(controller).build(); } diff --git a/platform-auth/src/main/java/com/eip4/platform/auth/stub/StubProjectSwitchService.java b/platform-auth/src/main/java/com/eip4/platform/auth/stub/StubProjectSwitchService.java index 604ec79..2214849 100644 --- a/platform-auth/src/main/java/com/eip4/platform/auth/stub/StubProjectSwitchService.java +++ b/platform-auth/src/main/java/com/eip4/platform/auth/stub/StubProjectSwitchService.java @@ -1,30 +1,123 @@ package com.eip4.platform.auth.stub; import java.util.HashMap; +import java.util.List; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import com.dsasp.server.common.viewframework.service.ProjectSwitchService; /** - * WS1 桩:项目切换服务。PoC 测试用户不挂项目。 + * {@link ProjectSwitchService} 真实实现(F2-5,替换 P2 遗留 no-op 桩)。 + * + *

对齐 EIP-3.0 原实现 + * {@code com.dsasp.pm.totalpackagecontract.service.ProjectSwitchServiceImpl}: + *

+ * + *

对原版的工程化改进(行为不变): + *

    + *
  1. 裸拼 SQL → {@code ?} 参数化,收敛 SQL 注入面;
  2. + *
  3. {@code jdbcTemplate.queryForLong}(Spring 4 已弃)→ + * {@code queryForObject(…, Long.class)} 兼容 Spring 6;
  4. + *
  5. DataAccessException 降级:DB 不可达时 {@code isUserInProjects}=false / + * {@code findAllProjectByUserId}=空 / {@code getProjectOrgId}=null,不阻断登录。
  6. + *
+ * + *

包名、类名、Spring Bean 名({@code projectSwitchService})与接口签名保持不变, + * 调用方({@link com.dsasp.server.dataDic.bean.GeneralPO#getOrgId})无感知替换。 */ @Service("projectSwitchService") public class StubProjectSwitchService implements ProjectSwitchService { + private static final Logger log = LoggerFactory.getLogger(StubProjectSwitchService.class); + + private final JdbcTemplate jdbcTemplate; + + public StubProjectSwitchService(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + } + + /** + * 判断用户是否关联任何项目。 + * + *

对齐原版:{@code select count(PM_PROJECTID) from PM_PROJECT_USER where userid=?}, + * 计数 > 0 则为 true。 + */ @Override public boolean isUserInProjects(String userId) { - return false; + if (userId == null || userId.isBlank()) { + return false; + } + try { + Long count = jdbcTemplate.queryForObject( + "SELECT count(pm_projectid) FROM pm_project_user WHERE userid = ?", + Long.class, userId); + return count != null && count > 0; + } catch (DataAccessException e) { + log.warn("[ProjectSwitchService] isUserInProjects 查询失败,降级返回 false: {}", e.getMessage()); + return false; + } } + /** + * 查询用户关联的所有项目(projectId → projectName)。 + * + *

对齐原版:联查 {@code pm_project ⋈ pm_project_user},返回 id→name 映射。 + */ @Override public Map findAllProjectByUserId(String userId) { - return new HashMap<>(); + Map result = new HashMap<>(); + if (userId == null || userId.isBlank()) { + return result; + } + try { + List> rows = jdbcTemplate.queryForList( + "SELECT pm_project_id, projectname FROM pm_project " + + "WHERE pm_project_id IN " + + "(SELECT DISTINCT pm_projectid FROM pm_project_user WHERE userid = ?)", + userId); + for (Map row : rows) { + String id = (String) row.get("pm_project_id"); + Object name = row.get("projectname"); + if (id != null) { + result.put(id.trim(), name != null ? name.toString() : ""); + } + } + } catch (DataAccessException e) { + log.warn("[ProjectSwitchService] findAllProjectByUserId 查询失败,降级返回空: {}", e.getMessage()); + } + return result; } + /** + * 获取项目所属机构(filiale)。 + * + *

对齐原版:{@code select FILIALE from PM_PROJECT where PM_PROJECT_ID=?}, + * 无行或 DB 不可达均返回 {@code null}。 + */ @Override public String getProjectOrgId(String projectId) { - return null; + if (projectId == null || projectId.isBlank()) { + return null; + } + try { + List rows = jdbcTemplate.queryForList( + "SELECT filiale FROM pm_project WHERE pm_project_id = ?", + String.class, projectId); + return rows.isEmpty() ? null : rows.get(0); + } catch (DataAccessException e) { + log.warn("[ProjectSwitchService] getProjectOrgId 查询失败,降级返回 null: {}", e.getMessage()); + return null; + } } } diff --git a/platform-auth/src/test/java/com/eip4/platform/auth/stub/ProjectSwitchServiceTest.java b/platform-auth/src/test/java/com/eip4/platform/auth/stub/ProjectSwitchServiceTest.java new file mode 100644 index 0000000..7fedafb --- /dev/null +++ b/platform-auth/src/test/java/com/eip4/platform/auth/stub/ProjectSwitchServiceTest.java @@ -0,0 +1,133 @@ +package com.eip4.platform.auth.stub; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.dao.DataAccessResourceFailureException; +import org.springframework.jdbc.core.JdbcTemplate; + +/** + * F2-5 ProjectSwitchService 真实实现单测。 + * + *

对齐 EIP-3.0 原版行为(不起 Spring 上下文,Mockito 直构造 JdbcTemplate): + *

+ */ +class ProjectSwitchServiceTest { + + private JdbcTemplate jdbc; + private StubProjectSwitchService service; + + @BeforeEach + void setUp() { + jdbc = mock(JdbcTemplate.class); + service = new StubProjectSwitchService(jdbc); + } + + // ── isUserInProjects ───────────────────────────────────────────────────── + + @Test + void isUserInProjects_用户有项目返回true() { + when(jdbc.queryForObject(anyString(), eq(Long.class), anyString())) + .thenReturn(3L); + assertTrue(service.isUserInProjects("USER_A")); + } + + @Test + void isUserInProjects_用户无项目返回false() { + when(jdbc.queryForObject(anyString(), eq(Long.class), anyString())) + .thenReturn(0L); + assertFalse(service.isUserInProjects("USER_B")); + } + + @Test + void isUserInProjects_空userId返回false() { + assertFalse(service.isUserInProjects(null)); + assertFalse(service.isUserInProjects("")); + assertFalse(service.isUserInProjects(" ")); + } + + @Test + void isUserInProjects_DB不可达降级返回false() { + when(jdbc.queryForObject(anyString(), eq(Long.class), anyString())) + .thenThrow(new DataAccessResourceFailureException("conn refused")); + assertFalse(service.isUserInProjects("USER_C")); + } + + // ── findAllProjectByUserId ─────────────────────────────────────────────── + + @Test + @SuppressWarnings("unchecked") + void findAllProjectByUserId_返回id_name映射() { + Map row1 = Map.of("pm_project_id", "P001", "projectname", "一期项目"); + Map row2 = Map.of("pm_project_id", "P002", "projectname", "二期项目"); + when(jdbc.queryForList(anyString(), anyString())) + .thenReturn(List.of(row1, row2)); + + Map result = service.findAllProjectByUserId("USER_A"); + assertEquals(2, result.size()); + assertEquals("一期项目", result.get("P001")); + assertEquals("二期项目", result.get("P002")); + } + + @Test + void findAllProjectByUserId_空userId返回空Map() { + assertTrue(service.findAllProjectByUserId(null).isEmpty()); + assertTrue(service.findAllProjectByUserId("").isEmpty()); + } + + @Test + void findAllProjectByUserId_DB不可达降级返回空Map() { + when(jdbc.queryForList(anyString(), anyString())) + .thenThrow(new DataAccessResourceFailureException("conn refused")); + assertTrue(service.findAllProjectByUserId("USER_A").isEmpty()); + } + + // ── getProjectOrgId ────────────────────────────────────────────────────── + + @Test + @SuppressWarnings("unchecked") + void getProjectOrgId_返回filiale() { + when(jdbc.queryForList(anyString(), eq(String.class), anyString())) + .thenReturn(List.of("ORG_FILIALE_001")); + assertEquals("ORG_FILIALE_001", service.getProjectOrgId("P001")); + } + + @Test + @SuppressWarnings("unchecked") + void getProjectOrgId_无项目返回null() { + when(jdbc.queryForList(anyString(), eq(String.class), anyString())) + .thenReturn(List.of()); + assertNull(service.getProjectOrgId("NOT_EXIST")); + } + + @Test + void getProjectOrgId_空projectId返回null() { + assertNull(service.getProjectOrgId(null)); + assertNull(service.getProjectOrgId("")); + } + + @Test + void getProjectOrgId_DB不可达降级返回null() { + when(jdbc.queryForList(anyString(), eq(String.class), anyString())) + .thenThrow(new DataAccessResourceFailureException("conn refused")); + assertNull(service.getProjectOrgId("P001")); + } +}