From f690f30552ce0d4a45854abc25968e880c7f1cc4 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 18 Jun 2026 00:49:03 +0800 Subject: [PATCH] fix(platform): repair message detail views --- docs/framework定制视图-TODO-2026-06-17.md | 4 ++-- .../platform/metadata/web/NoticeController.java | 17 ++++++++++++----- .../metadata/web/NoticeControllerTest.java | 12 ++++++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/docs/framework定制视图-TODO-2026-06-17.md b/docs/framework定制视图-TODO-2026-06-17.md index ab41ff0..fb217a4 100644 --- a/docs/framework定制视图-TODO-2026-06-17.md +++ b/docs/framework定制视图-TODO-2026-06-17.md @@ -9,7 +9,7 @@ | 口径 | 数量 | 说明 | |---|---:|---| | framework 定制视图总数 | 46 | README 总览口径;backlog 表格当前可解析出 45 行,需后续校正缺的 1 行。 | -| 已逐功能验收 / 可算 Done | 约 4 | 用户管理、功能模板下载、实体分类-枚举组、已办任务。功能模板下载/已办各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 | +| 已逐功能验收 / 可算 Done | 约 5 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 | | 代码已提交但待最终副作用验收 | 约 3 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;两者都未覆盖所有真实业务保存和权限差异验收。 | | 仍需修或逐功能验收 | 约 42 | 含上面的 3 个待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 | | 剩余工程单元 | 约 28+ | 多视图可复用同一套组件/端点,如脚本编辑器、消息详情、工作流按钮。 | @@ -28,6 +28,7 @@ | 2026-06-17 | 功能模板下载模板管理/设置:去右表单添加按钮、标题改「编辑模板附件」 | Done | `b5fe995`, `3276774` | 转换器测试;重转重导后生效 | | 2026-06-17 | 实体分类-枚举组:确认 EIP4 树端点 PK 唯一 + 去重,全量建树覆盖老 UUID 防重逻辑 | Done | 文档/核验项 | 无需移植 | | 2026-06-17 | 用户管理 Delta 端到端案例 | Done | 见 `用户管理-Delta移植-实现过程与踩坑-2026-06-17.md` | 已逐字段 dogfood | +| 2026-06-18 | 消息查看/已读:收到的消息查看弹窗、打开即已读、已发送消息只读详情 | Done | 本次提交 | `NoticeControllerTest`; 浏览器验收 `83971d1a`:本地记录 `94d3645c-2487-47f6-bbf5-ebdff3434f6e` 置未读后列表显示“否”,打开详情后 DB 与列表均回“是”;浏览器验收 `b7635622`:已发送消息只读详情正常,无“消息详情加载失败” | ## In Progress / Needs Verification @@ -47,7 +48,6 @@ | P1 | 我的发起任务 | `0db4af06` | 查看详细、撤回;撤回需 Flowable 桥和已流转校验 | 机制① + 流程端点 | | P1 | 流程监控 | `9f3b5a8b` | 处理、高级处理、结束流程;高级处理涉及 Groovy 权限/审计 | 机制① + 流程端点,需权限守卫 | | P1 | 审批表单删除 | `91ccbba3` | 查看只读表单、删除历史流程实例 | 复用只读审批抽屉 + 流程删除端点 | -| P1 | 消息查看/已读 | `83971d1a`, `b7635622` | 收到的消息查看弹窗、打开即已读、已发送消息只读详情 | MessageService REST + converted 按钮 | | P1 | 短消息 | `ae79a47b` | 发送消息弹窗;收件人使用已接线的标准 amis 用户 picker | MessageService REST + 发送弹窗 | ## P2(中等 delta,可批量复用) 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 5381b57..ce2918c 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 @@ -172,7 +172,7 @@ public class NoticeController { + " " + 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" + + " LEFT JOIN eip3.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" @@ -344,7 +344,7 @@ public class NoticeController { 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"; + + " LEFT JOIN eip3.view_sys_user u ON u.view_sys_user_id = m.createby"; } private static String messageDetailColumns() { @@ -355,9 +355,16 @@ public class NoticeController { + " 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," + + " (SELECT string_agg(COALESCE(NULLIF(TRIM(ru.displayname), ''), TRIM(mu2.sys_user_id)), ', ')" + + " FROM eip3.sys_messageuser mu2" + + " LEFT JOIN eip3.view_sys_user ru ON ru.view_sys_user_id = mu2.sys_user_id" + + " WHERE mu2.sys_message_id = m.sys_message_id" + + " AND mu2.isdel = 0) AS receivers," + + " (SELECT string_agg(TRIM(mu2.sys_user_id), ',')" + + " FROM eip3.sys_messageuser mu2" + + " WHERE mu2.sys_message_id = m.sys_message_id" + + " AND mu2.isdel = 0) AS receiver_ids," + + " NULL::text AS document," + " m.params AS params"; } 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 6a575f2..72ba904 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 @@ -1,8 +1,10 @@ package com.eip4.platform.metadata.web; 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 static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -19,6 +21,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; import org.mockito.MockedStatic; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.http.HttpStatus; @@ -178,6 +181,15 @@ class NoticeControllerTest { assertEquals("张三[001]", data.get("sender")); assertEquals(false, data.get("received")); assertEquals(false, data.get("readChanged")); + + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc).queryForMap(sql.capture(), eq("msg-011"), eq("user-008"), eq("user-008")); + assertTrue(sql.getValue().contains("eip3.sys_messageuser"), + "详情 SQL 应通过 sys_messageuser 聚合收件人"); + assertFalse(sql.getValue().contains("m.tousers"), + "真实 sys_message 表没有 tousers/tousersname 字段"); + assertFalse(sql.getValue().contains("m.document"), + "真实 sys_message 表没有 document 字段"); } @Test