From bf7bb2515b9df44ef9e48c6606a961a458b23261 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 18 Jun 2026 00:30:01 +0800 Subject: [PATCH] fix(platform): complete picker parity and message detail --- docs/framework定制视图-TODO-2026-06-17.md | 4 +- ...制视图-engineclass移植backlog-2026-06-17.md | 4 +- .../platform/converter/EngineclassDelta.java | 40 +++++ .../eip4/platform/converter/UiTypeMapper.java | 4 + .../TemplateToAmisConverterTest.java | 52 +++++++ .../metadata/web/NoticeController.java | 144 ++++++++++++++++++ .../metadata/web/NoticeControllerTest.java | 81 +++++++++- 7 files changed, 320 insertions(+), 9 deletions(-) diff --git a/docs/framework定制视图-TODO-2026-06-17.md b/docs/framework定制视图-TODO-2026-06-17.md index aad46f2..ab41ff0 100644 --- a/docs/framework定制视图-TODO-2026-06-17.md +++ b/docs/framework定制视图-TODO-2026-06-17.md @@ -10,7 +10,7 @@ |---|---:|---| | framework 定制视图总数 | 46 | README 总览口径;backlog 表格当前可解析出 45 行,需后续校正缺的 1 行。 | | 已逐功能验收 / 可算 Done | 约 4 | 用户管理、功能模板下载、实体分类-枚举组、已办任务。功能模板下载/已办各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 | -| 代码已提交但待最终副作用验收 | 约 3 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker 并页面烟测;流程选择框已接线/页面烟测;两者都未覆盖所有真实业务保存和权限差异验收。 | +| 代码已提交但待最终副作用验收 | 约 3 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;两者都未覆盖所有真实业务保存和权限差异验收。 | | 仍需修或逐功能验收 | 约 42 | 含上面的 3 个待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 | | 剩余工程单元 | 约 28+ | 多视图可复用同一套组件/端点,如脚本编辑器、消息详情、工作流按钮。 | @@ -34,7 +34,7 @@ | 范围 | 状态 | 缺口 | 下一步 | |---|---|---|---| | 流程/审批:待办任务 `TaskComponentNew` | Needs side-effect verification | 浏览器已验 `4ebfc9ee`、`0f7531e2`:列表有数据、发起人显名、查看详细抽屉、处理抽屉、遮罩层级均正常;未点最终同意/拒绝,未验处理后刷新 | 准备专门测试流程实例,或经用户确认可消耗真实待办后,再验“同意/拒绝/退回后列表刷新” | -| 用户选择框全家 | Implemented / Needs business verification | 最新口径:`eip4-platform 0d6fab4` 已把用户单选 `SelectDialog`、多选 `MultiSelectDialog` 统一转换为标准 amis `picker`(多选仅加 `multiple: true`,数据源 `/api/picker//list`);`eip4-web b0537f8` 兼容过滤器会把存量 `user-transfer-picker` schema 归一成同一标准 picker。自动化:`npm run test -- registerUserTransferPicker`、`npm run build`、`mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest test`。浏览器烟测:`54042d08` 查询单选「操作人」为标准 PickerControl,`e732c4b0` 业务表单多选「接收人」弹出 amis 表格+checkbox+搜索分页 | 继续在短消息、设置定时任务、岗位设置等真实引用页验保存值、ALL 互斥、受控/全部权限差异和考勤排除挂靠 | +| 用户选择框全家 | Implemented / Needs business verification | 最新口径:`eip4-platform 0d6fab4` 已把用户单选 `SelectDialog`、多选 `MultiSelectDialog` 统一转换为标准 amis `picker`(单选不加 `multiple`,多选仅加 `multiple: true` + `overflowConfig.maxTagCount=1`,数据源 `/api/picker//list`);`eip4-web b0537f8` 兼容过滤器会把存量 `user-transfer-picker` schema 归一成同一标准 picker,本轮补丁进一步移除旧自定义 renderer 注册,只保留 schema filter。自动化:`npm run test -- registerUserTransferPicker registerMessageAction`、`npm run build`、`mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest test`、`mvn -q -pl platform-metadata -Dtest=NoticeControllerTest test`。浏览器烟测:`54042d08` 查询单选「操作人」为标准 PickerControl;`919477da`「流程代理授权」代理人为标准单选 picker,和日期/下拉同高对齐;`5078945c`「用户组-分配用户」为标准多选 picker,默认值/label 正常,图标可打开二级 amis 表格弹窗,含搜索/分页/checkbox,多选确认后输入框仍 32px 且显示 `+ N ...`,未再撑开表单。 | 继续在短消息、设置定时任务、岗位设置等真实引用页验保存值、ALL 互斥、受控/全部权限差异和考勤排除挂靠 | | 流程选择框 | Implemented / Needs business verification | `ProcessSelectController` 已提供 `/api/process-select/options|search`;转换器已把 `b3070157` 接到 amis `transfer-picker`;`919477da` 流程代理授权已重转重导并从 PARTIAL 转 SUCCESS;浏览器 smoke 可打开弹窗,显示「流程名称/已选流程」和流程名 | 继续验流程代理授权保存闭环:代理类型=指定流程时必填、保存后 `wf_agent_process` 写入/读取一致 | | 菜单真入口 | Needs verification | 前端已去硬编码假入口;需确认所有需要的真菜单在 `sys_menu` 中可达 | 用 `/api/menu` 和页面侧栏核对 | | 功能模板下载门控 | Pending | backlog 写了 `VIEW_TEMPLATEID` 非空才显示附件编辑;当前只做了去按钮/改标题 | 决定是否补门控,若补则在 `EngineclassDelta` mutator 中按行/上下文控制 | diff --git a/docs/framework定制视图-engineclass移植backlog-2026-06-17.md b/docs/framework定制视图-engineclass移植backlog-2026-06-17.md index 1f93ac8..7d3ffbe 100644 --- a/docs/framework定制视图-engineclass移植backlog-2026-06-17.md +++ b/docs/framework定制视图-engineclass移植backlog-2026-06-17.md @@ -205,7 +205,7 @@ I have the structure confirmed (eip4-platform / eip4-web live under eip3/). The - 代码编辑器:amis `input-editor`(xml/groovy 模式)做通用脚本弹窗。 - 可视化设计器:对接 amis-editor 或自有低代码设计器(最重,流程定义对接 Flowable Modeler)。 -**推荐组合:** 轻/中量 delta → 机制①+③;重度 bespoke 编辑器 → 机制②+④+③;picker → 机制④(自定义组件)+③(查询端点)。 +**推荐组合:** 轻/中量 delta → 机制①+③;重度 bespoke 编辑器 → 机制②+④+③;用户 picker → 机制④(标准 amis `picker` 配置)+③(查询端点),不再把旧双栏 `user-transfer-picker` 作为常规渲染路径。 --- @@ -233,6 +233,6 @@ I have the structure confirmed (eip4-platform / eip4-web live under eip3/). The --- **相关绝对路径(待移植/待伴生分析的源文件):** -- `/Users/zhengwr/workspace/eip3/eip4-platform`(EIP4 后端/转换器,机制①③ 落点)、`/Users/zhengwr/workspace/eip3/eip4-web`(机制④ amis 自定义组件落点) +- `/Users/zhengwr/workspace/eip3/eip4-platform`(EIP4 后端/转换器,机制①③ 落点)、`/Users/zhengwr/workspace/eip3/eip4-web`(机制④ 标准 amis 配置兼容层与少量前端扩展落点) - picker 之母:`framework/com.dsasp.client.organize/src/com/dsasp/clinet/organize/view/UserSelectWindow.java`(及子类 UserOrgSelectWindow/AllUserSelectWindow) - 待伴生分析(JSON 中标注需另读):`SqlScriptToolWindow.java`、`RuleMainView.java`、`MailSettingWindow.java`、个人设置 6 子组件(ChangeuserphoneView/LeaderSettingComponent/MainPoisitionSettingComponent/DefPageSizeComponent/CustomMenuSettingComponent/DefProSettingComponent)、`FlowServiceEditor.java`/`ServiceFlowAdvance.java`、`UserTable.java`(设置定时任务)、`EditorProcessDefinitionDetailPanel.java`(流程定义) diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java b/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java index b7b0c38..d3074f1 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java @@ -77,6 +77,13 @@ public final class EngineclassDelta { EngineclassDelta::taskTodoDataSource); registerMutator("com.dsasp.client.wf.task.component.FinishTaskComponentNew", EngineclassDelta::taskDoneDataSource); + + // 消息查看:MessageReceiveView/MessageSendView 在默认 GridTemplateComponent 之上加「查看」按钮。 + // 收到消息按 SYS_MESSAGEUSER_ID 打开并置已读;已发送消息按 SYS_MESSAGE_ID 打开只读详情。 + register("com.dsasp.client.tools.message.MessageReceiveView", + EngineclassDelta::receivedMessageDetailButton); + register("com.dsasp.client.tools.message.MessageSendView", + EngineclassDelta::sentMessageDetailButton); } private EngineclassDelta() { @@ -309,6 +316,39 @@ public final class EngineclassDelta { return "${selectedItems[0]." + field + "}"; } + // ── 消息 · 查看详情 / 打开即已读 ─────────────────────────────────────── + /** 收到消息「查看」:选 1 条 SYS_MESSAGEUSER → 打开详情并置已读,关闭后刷新列表。 */ + private static Map receivedMessageDetailButton(String pkField) { + Map args = mapOf( + "kind", "received", + "receiveId", selectedSingleFieldExpr(pkField), + "title", "${selectedItems[0].SYS_MESSAGE_ID_DISPLAY__ || selectedItems[0].TITLE || ''}"); + return messageDetailButton(args); + } + + /** 已发送消息「查看」:选 1 条 SYS_MESSAGE → 只读详情。 */ + private static Map sentMessageDetailButton(String pkField) { + Map args = mapOf( + "kind", "sent", + "messageId", selectedSingleFieldExpr(pkField), + "title", "${selectedItems[0].TITLE || ''}"); + return messageDetailButton(args); + } + + private static Map messageDetailButton(Map args) { + Map action = mapOf( + "actionType", "openMessageDetail", + "args", args); + Map btn = new LinkedHashMap<>(); + btn.put("type", "button"); + btn.put("id", "查看"); + btn.put("label", "查看"); + btn.put("icon", "fa fa-search"); + btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}"); + btn.put("onEvent", mapOf("click", mapOf("actions", List.of(action)))); + return btn; + } + // ── 用户管理 · 设置主岗位 ────────────────────────────────────────────── /** * 「设置主岗位」按钮:选 1 用户 → 弹窗 form。initApi 拉该用户岗位(SYS_POSITIONUSER_SEARCH by USERID), diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java index 77be47a..6695de2 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java @@ -405,6 +405,10 @@ final class UiTypeMapper { item.put("clearable", true); if (multiple) { item.put("multiple", true); + item.put("overflowConfig", Map.of( + "maxTagCount", 1, + "displayPosition", List.of("select") + )); } item.put("source", "/api/picker/" + dialogId + "/list"); item.put("labelField", "_label"); diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index 4192343..1f18208 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -559,6 +559,9 @@ class TemplateToAmisConverterTest { assertEquals("picker", picker.get("type")); assertEquals(Boolean.TRUE, picker.get("multiple")); assertEquals("/api/picker/d9/list", picker.get("source")); + Map overflowConfig = (Map) picker.get("overflowConfig"); + assertEquals(1, overflowConfig.get("maxTagCount")); + assertEquals(List.of("select"), overflowConfig.get("displayPosition")); } @Test @@ -574,6 +577,7 @@ class TemplateToAmisConverterTest { Map picker = items.get(0); assertEquals("picker", picker.get("type")); assertNull(picker.get("multiple")); + assertNull(picker.get("overflowConfig")); assertEquals("/api/picker/" + dialogId + "/list", picker.get("source")); assertEquals("_label", picker.get("labelField")); assertEquals("_id", picker.get("valueField")); @@ -610,6 +614,9 @@ class TemplateToAmisConverterTest { assertEquals("picker", items.get(1).get("type")); assertEquals("picker", items.get(2).get("type")); assertEquals(Boolean.TRUE, items.get(0).get("multiple")); + Map overflowConfig = (Map) items.get(0).get("overflowConfig"); + assertEquals(1, overflowConfig.get("maxTagCount")); + assertEquals(List.of("select"), overflowConfig.get("displayPosition")); assertEquals("请点击右侧的图标", items.get(0).get("placeholder")); assertEquals("/api/picker/1b3bad0b-a24b-4347-9466-db78f7432756/list", items.get(0).get("source")); assertEquals("/api/picker/e31ce405-21c4-4892-94bb-e87e07b7f8e7/list", items.get(1).get("source")); @@ -1065,6 +1072,51 @@ class TemplateToAmisConverterTest { assertEquals("read", args.get("mode")); } + /** engineclass=MessageReceiveView → 注入「查看」,按 SYS_MESSAGEUSER 主键打开详情并置已读。 */ + @Test + @SuppressWarnings("unchecked") + void engineclass_MessageReceiveView_注入查看并置已读按钮() { + String xml = ""; + ConversionResult r = converter.convertGraded(xml, null, + "com.dsasp.client.tools.message.MessageReceiveView", "收到的消息", new ArrayList<>(), noPage); + List toolbar = (List) body(r.getSchema()).get("headerToolbar"); + Map detail = toolbar.stream() + .filter(o -> o instanceof Map && "查看".equals(((Map) o).get("label"))) + .map(o -> (Map) o).findFirst().orElse(null); + + assertNotNull(detail, "收到的消息应注入「查看」按钮"); + assertEquals("${!selectedItems || selectedItems.length !== 1}", detail.get("disabledOn")); + Map action = (Map) ((List) ((Map) + ((Map) detail.get("onEvent")).get("click")).get("actions")).get(0); + Map args = (Map) action.get("args"); + assertEquals("openMessageDetail", action.get("actionType")); + assertEquals("received", args.get("kind")); + assertEquals("${selectedItems[0].PM_DEMO_ID}", args.get("receiveId")); + assertTrue(String.valueOf(args.get("title")).contains("SYS_MESSAGE_ID_DISPLAY__"), + "收到消息标题应优先取列表中的消息显示名"); + } + + /** engineclass=MessageSendView → 注入「查看」,按 SYS_MESSAGE 主键打开只读详情。 */ + @Test + @SuppressWarnings("unchecked") + void engineclass_MessageSendView_注入查看按钮() { + String xml = ""; + ConversionResult r = converter.convertGraded(xml, null, + "com.dsasp.client.tools.message.MessageSendView", "已发送消息", new ArrayList<>(), noPage); + List toolbar = (List) body(r.getSchema()).get("headerToolbar"); + Map detail = toolbar.stream() + .filter(o -> o instanceof Map && "查看".equals(((Map) o).get("label"))) + .map(o -> (Map) o).findFirst().orElse(null); + + assertNotNull(detail, "已发送消息应注入「查看」按钮"); + Map action = (Map) ((List) ((Map) + ((Map) detail.get("onEvent")).get("click")).get("actions")).get(0); + Map args = (Map) action.get("args"); + assertEquals("openMessageDetail", action.get("actionType")); + assertEquals("sent", args.get("kind")); + assertEquals("${selectedItems[0].PM_DEMO_ID}", args.get("messageId")); + } + /** * engineclass=FuncDownloadComponent(功能模板下载模板管理/设置,type=3 树页)→ 整页改写器(机制① MUTATORS): * 移除右表单「添加」按钮(空 toolbar 整条移除)+ 右表单标题改「编辑模板附件」。复刻 refreshRightLayout。 diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/NoticeController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/NoticeController.java index fe52c2a..5381b57 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/NoticeController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/NoticeController.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.jdbc.core.JdbcOperations; @@ -47,6 +48,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; *
    *
  • {@code GET /api/notice} — 当前用户消息分页列表,支持 unreadOnly 过滤
  • *
  • {@code GET /api/notice/unread-count} — 轻量未读数计数(顶栏轮询用)
  • + *
  • {@code GET /api/notice/{id}/detail} — 已发送/可访问消息详情
  • + *
  • {@code POST /api/notice/received/{id}/open} — 收到消息打开详情并置已读
  • *
  • {@code POST /api/notice/{id}/read} — 单条置已读
  • *
  • {@code POST /api/notice/read-all} — 当前用户全部已读
  • *
@@ -119,6 +122,80 @@ public class NoticeController { return okList(items, total); } + // ---------------------------------------------------------------- 消息详情 + + /** + * 按 sys_message_id 加载消息详情。 + * + *

用于「已发送消息」查看按钮,也允许当前用户作为收件人查看同一消息。访问守卫: + * 当前用户是 createby,或当前用户在 sys_messageuser 中存在未删除收件记录。 + */ + @Operation(summary = "消息详情(按 sys_message_id,只读)", + description = "当前用户必须是发送人或收件人;返回 title/content/sender/receivers/document 等详情字段") + @GetMapping("/api/notice/{id}/detail") + public Map detail( + @Parameter(description = "sys_message_id(36位)") @PathVariable String id) { + + String userId = requireCurrentUserId(); + String sql = messageDetailSelect() + + " WHERE m.sys_message_id = CAST(? AS character(36))" + + " AND m.isdel = 0" + + " AND (m.createby = CAST(? AS character(36))" + + " OR EXISTS (SELECT 1 FROM eip3.sys_messageuser mu" + + " WHERE mu.sys_message_id = m.sys_message_id" + + " AND mu.sys_user_id = CAST(? AS character(36))" + + " AND mu.isdel = 0))"; + try { + Map row = jdbcTemplate.queryForMap(sql, id.trim(), userId, userId); + return okDetail(row, false, false); + } catch (EmptyResultDataAccessException ex) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "消息不存在或无权查看"); + } + } + + /** + * 按 sys_messageuser_id 打开收到消息详情,并将当前用户这条接收记录置为已读。 + * + *

复刻老 {@code MessageReceiveView.detail()}:先按收到消息主键加载 + * {@code SYS_MESSAGEUSER},再取 {@code SYS_MESSAGE_ID} 加载 {@code SYS_MESSAGE},未读时更新 + * {@code ISREAD=true}。这里用一个 POST 完成,避免 GET initApi 承担写副作用。 + */ + @Operation(summary = "打开收到消息详情并置已读", + description = "按 sys_messageuser_id + 当前用户校验;未读时 UPDATE sys_messageuser.isread=1") + @PostMapping("/api/notice/received/{id}/open") + public Map openReceived( + @Parameter(description = "sys_messageuser_id(36位)") @PathVariable String id) { + + String userId = requireCurrentUserId(); + String sql = "SELECT TRIM(mu.sys_messageuser_id) AS receive_id," + + " mu.isread AS receive_isread," + + " " + messageDetailColumns() + + " FROM eip3.sys_messageuser mu" + + " JOIN eip3.sys_message m ON m.sys_message_id = mu.sys_message_id" + + " LEFT JOIN view_sys_user u ON u.view_sys_user_id = m.createby" + + " WHERE mu.sys_messageuser_id = CAST(? AS character(36))" + + " AND mu.sys_user_id = CAST(? AS character(36))" + + " AND mu.isdel = 0" + + " AND m.isdel = 0"; + try { + Map row = jdbcTemplate.queryForMap(sql, id.trim(), userId); + boolean wasRead = isTruthy(row.get("receive_isread")); + boolean changed = false; + if (!wasRead) { + int affected = jdbcTemplate.update( + "UPDATE eip3.sys_messageuser SET isread = 1" + + " WHERE sys_messageuser_id = CAST(? AS character(36))" + + " AND sys_user_id = CAST(? AS character(36))" + + " AND isdel = 0", + id.trim(), userId); + changed = affected > 0; + } + return okDetail(row, true, changed); + } catch (EmptyResultDataAccessException ex) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "消息不存在或无权查看"); + } + } + // ---------------------------------------------------------------- 未读数计数 /** @@ -239,4 +316,71 @@ public class NoticeController { resp.put("data", data); return resp; } + + private Map okDetail(Map row, boolean received, boolean readChanged) { + Map data = new LinkedHashMap<>(); + data.put("id", string(row.get("id"))); + data.put("receiveId", string(row.get("receive_id"))); + data.put("title", row.get("title")); + data.put("content", row.get("content")); + data.put("type", row.get("type")); + data.put("createTime", row.get("createtime")); + data.put("senderId", string(row.get("sender_id"))); + data.put("sender", fallback(row.get("sender"), row.get("sender_id"))); + data.put("receivers", row.get("receivers")); + data.put("receiverIds", row.get("receiver_ids")); + data.put("document", row.get("document")); + data.put("params", row.get("params")); + data.put("received", received); + data.put("readChanged", readChanged); + + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + resp.put("msg", ""); + resp.put("data", data); + return resp; + } + + private static String messageDetailSelect() { + return "SELECT " + messageDetailColumns() + + " FROM eip3.sys_message m" + + " LEFT JOIN view_sys_user u ON u.view_sys_user_id = m.createby"; + } + + private static String messageDetailColumns() { + return "TRIM(m.sys_message_id) AS id," + + " m.title," + + " m.content," + + " m.type," + + " m.createtime," + + " TRIM(m.createby) AS sender_id," + + " COALESCE(NULLIF(TRIM(u.displayname), ''), TRIM(m.createby)) AS sender," + + " m.tousersname AS receivers," + + " m.tousers AS receiver_ids," + + " m.document AS document," + + " m.params AS params"; + } + + private static String string(Object value) { + return value == null ? "" : String.valueOf(value).trim(); + } + + private static String fallback(Object value, Object fallback) { + String s = string(value); + return s.isEmpty() ? string(fallback) : s; + } + + private static boolean isTruthy(Object value) { + if (value == null) { + return false; + } + if (value instanceof Boolean b) { + return b; + } + if (value instanceof Number n) { + return n.intValue() != 0; + } + String s = String.valueOf(value).trim(); + return "1".equals(s) || "true".equalsIgnoreCase(s) || "yes".equalsIgnoreCase(s); + } } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/NoticeControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/NoticeControllerTest.java index 88e4f49..6a575f2 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/NoticeControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/NoticeControllerTest.java @@ -7,6 +7,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.LinkedHashMap; @@ -19,6 +20,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.jdbc.core.JdbcOperations; @@ -30,7 +32,8 @@ import com.dsasp.server.common.util.UserSession; /** * F2-11 NoticeController 单测(mock JdbcTemplate + UserSession,不连库)。 * - *

覆盖:消息分页(全量/仅未读/perPage 截断)、未读数计数、单条置已读、全部已读、未认证拒绝。 + *

覆盖:消息分页(全量/仅未读/perPage 截断)、详情加载、收到消息打开即已读、 + * 未读数计数、单条置已读、全部已读、未认证拒绝。 * 响应格式统一校验 amis crud 约定 {status:0, data:{items, total}} 或 {status:0, data:{count:N}}。 */ @SuppressWarnings({"unchecked", "rawtypes"}) @@ -157,10 +160,62 @@ class NoticeControllerTest { assertThrows(ResponseStatusException.class, () -> controller.unreadCount()); } + // ---------------------------------------------------------------- 消息详情 + + @Test + @DisplayName("8. 已发送消息详情 → 按 sys_message_id 返回只读详情") + void detailByMessageId() { + mockUser("user-008"); + when(jdbc.queryForMap(anyString(), eq("msg-011"), eq("user-008"), eq("user-008"))) + .thenReturn(fakeDetail("msg-011")); + + Map resp = controller.detail("msg-011"); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertEquals("msg-011", data.get("id")); + assertEquals("测试消息", data.get("title")); + assertEquals("张三[001]", data.get("sender")); + assertEquals(false, data.get("received")); + assertEquals(false, data.get("readChanged")); + } + + @Test + @DisplayName("9. 收到消息打开详情 → 未读时置已读并返回 readChanged=true") + void openReceivedMarksRead() { + mockUser("user-009"); + Map row = fakeDetail("msg-012"); + row.put("receive_id", "recv-001"); + row.put("receive_isread", 0); + when(jdbc.queryForMap(anyString(), eq("recv-001"), eq("user-009"))).thenReturn(row); + when(jdbc.update(anyString(), eq("recv-001"), eq("user-009"))).thenReturn(1); + + Map resp = controller.openReceived("recv-001"); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertEquals("recv-001", data.get("receiveId")); + assertEquals(true, data.get("received")); + assertEquals(true, data.get("readChanged")); + verify(jdbc).update(anyString(), eq("recv-001"), eq("user-009")); + } + + @Test + @DisplayName("10. 消息详情不存在或无权 → 404 ResponseStatusException") + void detailNotFound() { + mockUser("user-010"); + when(jdbc.queryForMap(anyString(), eq("missing"), eq("user-010"), eq("user-010"))) + .thenThrow(new EmptyResultDataAccessException(1)); + + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> controller.detail("missing")); + assertEquals(HttpStatus.NOT_FOUND, ex.getStatusCode()); + } + // ---------------------------------------------------------------- 单条置已读 @Test - @DisplayName("8. 单条置已读 → HTTP 200, status=0, affected=1") + @DisplayName("11. 单条置已读 → HTTP 200, status=0, affected=1") void markRead() { mockUser("user-006"); when(jdbc.update(anyString(), eq("msg-010"), eq("user-006"))).thenReturn(1); @@ -175,7 +230,7 @@ class NoticeControllerTest { } @Test - @DisplayName("9. 未登录时 markRead → 抛 401 ResponseStatusException") + @DisplayName("12. 未登录时 markRead → 抛 401 ResponseStatusException") void markReadUnauthenticated() { mockNotLoggedIn(); assertThrows(ResponseStatusException.class, () -> controller.markRead("msg-010")); @@ -184,7 +239,7 @@ class NoticeControllerTest { // ---------------------------------------------------------------- 全部已读 @Test - @DisplayName("10. 全部已读 → HTTP 200, status=0, affected=3") + @DisplayName("13. 全部已读 → HTTP 200, status=0, affected=3") void markAllRead() { mockUser("user-007"); when(jdbc.update(anyString(), eq("user-007"))).thenReturn(3); @@ -199,7 +254,7 @@ class NoticeControllerTest { } @Test - @DisplayName("11. 未登录时 markAllRead → 抛 401 ResponseStatusException") + @DisplayName("14. 未登录时 markAllRead → 抛 401 ResponseStatusException") void markAllReadUnauthenticated() { mockNotLoggedIn(); assertThrows(ResponseStatusException.class, () -> controller.markAllRead()); @@ -218,4 +273,20 @@ class NoticeControllerTest { m.put("isread", isread); return m; } + + private Map fakeDetail(String id) { + Map m = new LinkedHashMap<>(); + m.put("id", id); + m.put("title", "测试消息"); + m.put("content", "消息内容"); + m.put("type", 2); + m.put("createtime", 123456789L); + m.put("sender_id", "user-001"); + m.put("sender", "张三[001]"); + m.put("receivers", "李四[002]"); + m.put("receiver_ids", "user-002"); + m.put("document", null); + m.put("params", null); + return m; + } }